[or-cvs] r10134: When we cannot find a micro-revision number, do not overwrit (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-05-07 13:11:53 -0400 (Mon, 07 May 2007)
New Revision: 10134

Modified:
   tor/trunk/
   tor/trunk/src/or/Makefile.am
Log:
 r12676@catbus:  nickm | 2007-05-07 13:11:38 -0400
 When we cannot find a micro-revision number, do not overwrite an already-present micro-revision.i.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r12676] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/Makefile.am
===================================================================
--- tor/trunk/src/or/Makefile.am	2007-05-07 15:47:02 UTC (rev 10133)
+++ tor/trunk/src/or/Makefile.am	2007-05-07 17:11:53 UTC (rev 10134)
@@ -66,10 +66,11 @@
             echo \"$$rev\" > micro-revision.tmp;                \
           fi;                                                   \
         fi;                                                     \
-	if test ! -f micro-revision.tmp; then			\
-	  echo '""' > micro-revision.tmp;			\
-	fi;                                                     \
-	if test ! -f micro-revision.i || \
+	if test ! -f micro-revision.tmp ; then                  \
+	  if test ! -f micro-revision.i ; then                  \
+	    echo '""' > micro-revision.i;                       \
+	  fi;                                                   \
+	elif test ! -f micro-revision.i ||                      \
           test "`cat micro-revision.tmp`" != "`cat micro-revision.i`"; then \
 	  mv micro-revision.tmp micro-revision.i;               \
 	fi