[gnue] r9058 - in trunk/gnue-common: . src/setup src/utils

[reinhard]

Author: reinhard
Date: 2006-11-23 04:17:06 -0600 (Thu, 23 Nov 2006)
New Revision: 9058

Modified:
   trunk/gnue-common/setup.py
   trunk/gnue-common/src/setup/GSetup.py
   trunk/gnue-common/src/utils/version.py
Log:
Small improvements to versioning code.


Modified: trunk/gnue-common/setup.py
===================================================================
--- trunk/gnue-common/setup.py  2006-11-23 10:05:29 UTC (rev 9057)
+++ trunk/gnue-common/setup.py  2006-11-23 10:17:06 UTC (rev 9058)
@@ -166,7 +166,7 @@
 
     print "building svnrev.py"
     output = open(filename, 'w')
-    output.write('svnrev = %s' % version.get_svn_revision('src'))
+    output.write('svnrev = %r' % version.get_svn_revision('src'))
     output.close()
 
 

Modified: trunk/gnue-common/src/setup/GSetup.py
===================================================================
--- trunk/gnue-common/src/setup/GSetup.py       2006-11-23 10:05:29 UTC (rev 
9057)
+++ trunk/gnue-common/src/setup/GSetup.py       2006-11-23 10:17:06 UTC (rev 
9058)
@@ -253,7 +253,7 @@
 
       print "building svnrev.py"
       output = open(filename, 'w')
-      output.write('svnrev = %s' % version.get_svn_revision('src'))
+      output.write('svnrev = %r' % version.get_svn_revision('src'))
       output.close()
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-common/src/utils/version.py
===================================================================
--- trunk/gnue-common/src/utils/version.py      2006-11-23 10:05:29 UTC (rev 
9057)
+++ trunk/gnue-common/src/utils/version.py      2006-11-23 10:17:06 UTC (rev 
9058)
@@ -54,7 +54,7 @@
         return 0
 
     if os.name != 'posix':
-        return "'unknown'"
+        return 'unknown'
 
     if os.path.islink(directory):
         directory = os.readlink(directory)
@@ -62,17 +62,16 @@
     cmd = ("LANG=C svn info %s | grep 'Last Changed Rev:' " + \
             "| sed -e 's/Last Changed Rev: //'") % directory
 
-    filename = tempfile.mktemp('svnrev')
-    os.system(cmd + '> %s' % filename)
+    import commands
+    # Unfortunately, svn does not set an exit status on all errors, so there's
+    # no use in testing the status.
+    output = commands.getoutput(cmd)
+    try:
+        return int(output)
+    except ValueError:
+        return 'unknown'
 
-    tmpfile = file(filename, 'r')
-    rev = int(tmpfile.read())
-    tmpfile.close()
-    os.remove(filename)
 
-    return rev
-
-
 # =============================================================================
 # Version class
 # =============================================================================