Changeset 4640 for install/g2pkg/src

Timestamp:

Nov 2, 2020 9:42:45 PM (3 years ago)

Author:

toby

Message:

workarounds for Mac svn checksum problem

File:

• install/g2pkg/src/bootstrap.py (modified) (3 diffs)

install/g2pkg/src/bootstrap.py

@@ -120 +120 @@
     '''
     if isinstance(arg,str): return arg
-    if isinstance(arg,bytes): return arg.decode()
+    if isinstance(arg,bytes):
+        try:
+            return arg.decode()
+        except:
+            print('Decode error')
+            return arg
     if isinstance(arg,list):
         return [MakeByte2str(i) for i in arg]
@@ -242 +247 @@
     M,m = ver.split('.')[:2]
     return int(M)+int(m)/10.
+
+def svnChecksumPatch(svn,fpath,verstr):
+    '''This performs a fix when svn cannot finish an update because of
+    a Checksum mismatch error. This seems to be happening on OS X for 
+    unclear reasons. 
+    '''
+    print('\nAttempting patch for svn Checksum mismatch error\n')
+    cmd = [svn,'cleanup',fpath]
+    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+    out,err = MakeByte2str(s.communicate())
+    #if err: print('error=',err)
+    cmd = ['svn','update','--set-depth','empty',
+               os.path.join(fpath,'bindist')]
+    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+    out,err = MakeByte2str(s.communicate())
+    #if err: print('error=',err)
+    try:
+        import GSASIIpath
+        print('import of GSASIIpath completed')
+    except Exception as err:
+        msg = 'Failed with import of GSASIIpath. This is unexpected.'
+        msg += '\nGSAS-II will not run without correcting this. Contact toby@anl.gov'
+        BailOut(msg)
+    GSASIIpath.DownloadG2Binaries(g2home,verbose=True)
+    cmd = ['svn','update','--set-depth','infinity',
+               os.path.join(fpath,'bindist')]
+    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+    out,err = MakeByte2str(s.communicate())
+    #if err: print('error=',err)
+    cmd = [svn,'update',fpath,verstr,
+                       '--non-interactive',
+                       '--accept','theirs-conflict','--force']
+    if svnVersionNumber() >= 1.6:
+        cmd += ['--trust-server-cert']
+    if proxycmds: cmd += proxycmds
+    #print(cmd)
+    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+    out,err = MakeByte2str(s.communicate())
+    #if err: print('error=',err)
+    return err
 
 ################################################################################
@@ -452 +497 @@
         print('\nsubversion output:')
         out,err = MakeByte2str(s.communicate())
-        if err:
+        if 'Checksum' in err:  # deal with Checksum problem
+            err = svnChecksumPatch(svn,path2GSAS2,'-rHEAD')
+            if err:
+                print('error from svnChecksumPatch\n\t',err)
+        elif err:
             print('subversion returned an error:')
             print(out)