Changeset 4771 for install/bootstrap.py

Timestamp:

Jan 16, 2021 10:17:50 AM (3 years ago)

Author:

toby

Message:

fixes for windows g2complete

File:

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

install/bootstrap.py

@@ -48 +48 @@
         if len(vers) > 1:
             pyVersion = vers[1]
+            print('Selecting Python binary',pyVersion)
+        print('Selecting numpy binary',npVersion)
         skipInstallChecks = True
         if sys.platform.startswith('win'): showWXerror = True
@@ -271 +273 @@
     print(s)
 
-def svncleanup(spath):
+def svncleanup(spath,svn=None):
+    if not svn: svn = whichsvn()
+    if not svn: return
     svntmp = os.path.join(spath,'.svn','tmp')
-    if not os.path.exists(svntmp):
+    if os.path.exists(os.path.join(spath,'.svn')) and not os.path.exists(svntmp):
         print('missing subversion tmp directory, fixing')        
         cmd = ['mkdir',svntmp]
@@ -280 +284 @@
         if out: print(out)
         if err: print(err)
-    cmd = [svn, 'cleanup', spath]
-    s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
-    out,err = MakeByte2str(s.communicate())
-    if err:
-        print('subversion cleanup returned an error:')
-        if out: print(out)
-        if err: print(err)
-    
+    if os.path.exists(os.path.join(spath,'.svn')):
+        cmd = [svn, 'cleanup', spath]
+        s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
+        out,err = MakeByte2str(s.communicate())
+        if err:
+            print('subversion cleanup returned an error:')
+            if out: print(out)
+            if err: print(err)
+
 def svnChecksumPatch(svn,fpath,verstr):
     '''This performs a fix when svn cannot finish an update because of
@@ -583 +588 @@
     print('\n'+75*'*')
 else:
-    svn = whichsvn()
-    if svn: svncleanup(path2GSAS2)
+    svncleanup(path2GSAS2)
 
 # subsequent commands require GSASIIpath which better be here now, import it