Changeset 12245 in genesis

Timestamp:

Apr 18, 2013, 6:39:47 AM (12 years ago)

Author:

www

Message:

Path to binary needs to be absolute

File:

• tools/gformat.py (modified) (3 diffs)

tools/gformat.py

@@ -32 +32 @@
 import os
 sys.path.append(os.path.dirname(__file__))
-sys.path.append('/usr/local/bin')
+
+SVN = '/usr/local/bin/svn'
 
 import cgi
@@ -181 +182 @@
     # Sometimes getting version information is useless or harmfull, like in the pre-commit hooks
     if add_version_info:
-      p = subprocess.Popen(['svn', 'info', datadump['autogen_gfile']], stderr=subprocess.STDOUT, stdout=subprocess.PIPE)
+      p = subprocess.Popen([SVN, 'info', datadump['autogen_gfile']], stderr=subprocess.STDOUT, stdout=subprocess.PIPE)
       lines = p.communicate()[0].split('\n')
       if p.returncode == 0:
@@ -1158 +1159 @@
   if form and form.has_key("action") and "update" in form["action"]:
     output = "[INFO] Updating subverion, please wait...\n"
-    output += subprocess.Popen(['svn', 'cleanup', "%s/.." % NODE_DIR], stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0]
-    output += subprocess.Popen(['svn', 'up', "%s/.." % NODE_DIR], stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0]
+    output += subprocess.Popen([SVN, 'cleanup', "%s/.." % NODE_DIR], stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0]
+    output += subprocess.Popen([SVN, 'up', "%s/.." % NODE_DIR], stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0]
     output += "[INFO] All done, redirecting in 5 seconds"
     response_headers += [