Changeset 4732 for install/g2complete/src

Timestamp:

Jan 6, 2021 11:13:16 PM (3 years ago)

Author:

toby

Message:

workarounds for missing files

Location:

install

Files:

• . (modified) (1 prop)
• g2complete/src/bootstrap.py (modified) (5 diffs)

install/g2complete/src/bootstrap.py

@@ -253 +253 @@
     print(s)
 
+def svncleanup(spath):
+    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)
+    svntmp = os.path.join(spath,'.svn','tmp')
+    if not os.path.exists(svntmp):
+        print('missing subversion tmp directory, fixing')        
+        cmd = ['mkdir',svntmp]
+        s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
+        out,err = MakeByte2str(s.communicate())
+        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
@@ -258 +275 @@
     unclear reasons. 
     '''
+    svntmp = os.path.join(fpath,'.svn','tmp')
+    if not os.path.exists(svntmp):
+        print('missing subversion tmp directory')
     print('\nAttempting patch for svn Checksum mismatch error\n')
-    cmd = [svn,'cleanup',fpath]
-    showsvncmd(cmd)        
-    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-    out,err = MakeByte2str(s.communicate())
-    #if err: print('error=',err)
+    svncleanup(fpath)
     cmd = ['svn','update','--set-depth','empty',
                os.path.join(fpath,'bindist')]
@@ -269 +285 @@
     s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
     out,err = MakeByte2str(s.communicate())
+    print(svntmp, os.path.exists(svntmp))
     #if err: print('error=',err)
     try:
@@ -276 +293 @@
         msg = 'Failed with import of GSASIIpath. This is unexpected.'
         msg += '\nGSAS-II will not run without correcting this. Contact toby@anl.gov'
+        print(err)
         BailOut(msg)
     cmd = ['svn','switch',g2home+'/trunk/bindist',
@@ -498 +516 @@
         if err:
             print('Retrying after a cleanup...')
-            cmd = [svn, 'cleanup', path2GSAS2]
-            s = subprocess.Popen(cmd,stderr=subprocess.PIPE)
-            out,err = MakeByte2str(s.communicate())
-            if err:
-                print('subversion returned an error:')
-                print(out)
-                print(err)
+            svncleanup(path2GSAS2)
         cmd = [svn, 'co', g2home+ 'trunk/', path2GSAS2, '--non-interactive', '--trust-server-cert']
         if proxycmds: cmd += proxycmds