Changeset 901

Timestamp:

May 8, 2013 11:54:23 PM (12 years ago)

Author:

toby

Message:

look for svn in path & wandisco location

File:

• install/bootstrap.py (modified) (2 diffs)

install/bootstrap.py ¶

@@ -24 +24 @@
 
 print 'Checking for subversion...',
-try: 
-    #p = subprocess.call(['svn','status'],stdout=subprocess.PIPE)
-    p = subprocess.Popen(['svn','help'],stdout=subprocess.PIPE)
-except:
+# add the standard location for wandisco svn to the path
+for path in os.environ['PATH'].split(':')+['/opt/subversion/bin',]:
+    svn = os.path.join(path,'svn')
+    try:
+        p = subprocess.Popen([svn,'help'],stdout=subprocess.PIPE)
+        res = p.stdout.read()
+        p.communicate()
+        break
+    except:
+        pass
+else:
     raise Exception('Subversion (svn) not found')
-res = p.stdout.read()
-p.communicate()
+print ' found in',svn
 print 'OK'
 
@@ -53 +59 @@
 
 cmds = (
-    (['svn', 'co', home+ 'trunk/', gsaspath],'loading GSAS-II'),
-    #(['svn', 'co', home+ 'gsas/all', gsaspath],'loading GSAS common'),
+    ([svn, 'co', home+ 'trunk/', gsaspath],'loading GSAS-II'),
 )