Ignore:
Timestamp:
Jan 16, 2021 10:17:50 AM (9 months ago)
Author:
toby
Message:

fixes for windows g2complete

File:
1 edited

Legend:

Unmodified
Added
Removed
  • install/g2complete/src/bootstrap.py

    r4748 r4771  
    4848        if len(vers) > 1:
    4949            pyVersion = vers[1]
     50            print('Selecting Python binary',pyVersion)
     51        print('Selecting numpy binary',npVersion)
    5052        skipInstallChecks = True
    5153        if sys.platform.startswith('win'): showWXerror = True
     
    271273    print(s)
    272274
    273 def svncleanup(spath):
     275def svncleanup(spath,svn=None):
     276    if not svn: svn = whichsvn()
     277    if not svn: return
    274278    svntmp = os.path.join(spath,'.svn','tmp')
    275     if not os.path.exists(svntmp):
     279    if os.path.exists(os.path.join(spath,'.svn')) and not os.path.exists(svntmp):
    276280        print('missing subversion tmp directory, fixing')       
    277281        cmd = ['mkdir',svntmp]
     
    280284        if out: print(out)
    281285        if err: print(err)
    282     cmd = [svn, 'cleanup', spath]
    283     s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
    284     out,err = MakeByte2str(s.communicate())
    285     if err:
    286         print('subversion cleanup returned an error:')
    287         if out: print(out)
    288         if err: print(err)
    289    
     286    if os.path.exists(os.path.join(spath,'.svn')):
     287        cmd = [svn, 'cleanup', spath]
     288        s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
     289        out,err = MakeByte2str(s.communicate())
     290        if err:
     291            print('subversion cleanup returned an error:')
     292            if out: print(out)
     293            if err: print(err)
     294
    290295def svnChecksumPatch(svn,fpath,verstr):
    291296    '''This performs a fix when svn cannot finish an update because of
     
    583588    print('\n'+75*'*')
    584589else:
    585     svn = whichsvn()
    586     if svn: svncleanup(path2GSAS2)
     590    svncleanup(path2GSAS2)
    587591
    588592# subsequent commands require GSASIIpath which better be here now, import it
Note: See TracChangeset for help on using the changeset viewer.