r23365 - /trunk/version.py -- May 23, 2014 - 09:03

Author: bugman
Date: Fri May 23 09:03:27 2014
New Revision: 23365

URL: http://svn.gna.org/viewcvs/relax?rev=23365&view=rev
Log:
Attempt at fixing bug #22071, the relax unit test and system test not 
functioning.

This is reported at https://gna.org/bugs/?22071.

The fix here is that the git commands to show the current subversion revision 
number only works when
run from the relax base directory, or one of the subdirectories.  This should 
now be fixed, as the
pipe running the command will first 'cd' to the relax base directory.

Modified:
    trunk/version.py

Modified: trunk/version.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/version.py?rev=23365&r1=23364&r2=23365&view=diff
==============================================================================
--- trunk/version.py    (original)
+++ trunk/version.py    Fri May 23 09:03:27 2014
@@ -71,7 +71,7 @@
                 return str(row[1])
 
     # Try git-svn, reading the output if there are no errors.
-    pipe = Popen('git svn find-rev $(git rev-parse HEAD)', shell=True, 
stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=False)
+    pipe = Popen('cd %s; git svn find-rev $(git rev-parse HEAD)' % 
status.install_path, shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE, 
close_fds=False)
     if not pipe.stderr.readlines():
         # Loop over the output lines.
         for line in pipe.stdout.readlines():