Changeset 901


Ignore:
Timestamp:
May 8, 2013 11:54:23 PM (9 years ago)
Author:
toby
Message:

look for svn in path & wandisco location

File:
1 edited

Legend:

Unmodified
Added
Removed
  • install/bootstrap.py

    r672 r901  
    2424
    2525print 'Checking for subversion...',
    26 try:
    27     #p = subprocess.call(['svn','status'],stdout=subprocess.PIPE)
    28     p = subprocess.Popen(['svn','help'],stdout=subprocess.PIPE)
    29 except:
     26# add the standard location for wandisco svn to the path
     27for path in os.environ['PATH'].split(':')+['/opt/subversion/bin',]:
     28    svn = os.path.join(path,'svn')
     29    try:
     30        p = subprocess.Popen([svn,'help'],stdout=subprocess.PIPE)
     31        res = p.stdout.read()
     32        p.communicate()
     33        break
     34    except:
     35        pass
     36else:
    3037    raise Exception('Subversion (svn) not found')
    31 res = p.stdout.read()
    32 p.communicate()
     38print ' found in',svn
    3339print 'OK'
    3440
     
    5359
    5460cmds = (
    55     (['svn', 'co', home+ 'trunk/', gsaspath],'loading GSAS-II'),
    56     #(['svn', 'co', home+ 'gsas/all', gsaspath],'loading GSAS common'),
     61    ([svn, 'co', home+ 'trunk/', gsaspath],'loading GSAS-II'),
    5762)
    5863
Note: See TracChangeset for help on using the changeset viewer.