Changeset 4645 for install/g2pkg

Timestamp:

Nov 3, 2020 6:19:08 PM (3 years ago)

Author:

toby

Message:

more workarounds for Mac svn checksum problem

File:

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

install/g2pkg/src/bootstrap.py

@@ -248 +248 @@
     return int(M)+int(m)/10.
 
+def showsvncmd(cmd):
+    s = '\nsvn command:  '
+    for i in cmd: s += i + ' '
+    print(s)
+
 def svnChecksumPatch(svn,fpath,verstr):
     '''This performs a fix when svn cannot finish an update because of
@@ -255 +260 @@
     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())
@@ -260 +266 @@
     cmd = ['svn','update','--set-depth','empty',
                os.path.join(fpath,'bindist')]
+    showsvncmd(cmd)        
     s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
     out,err = MakeByte2str(s.communicate())
@@ -270 +277 @@
         msg += '\nGSAS-II will not run without correcting this. Contact toby@anl.gov'
         BailOut(msg)
+    cmd = ['svn','switch',g2home+'/trunk/bindist',
+               os.path.join(fpath,'bindist'),
+               '--non-interactive', '--trust-server-cert', '--accept',
+               'theirs-conflict', '--force', '-rHEAD', '--ignore-ancestry']
+    showsvncmd(cmd)        
+    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+    out,err = MakeByte2str(s.communicate())
     GSASIIpath.DownloadG2Binaries(g2home,verbose=True)
     cmd = ['svn','update','--set-depth','infinity',
                os.path.join(fpath,'bindist')]
+    showsvncmd(cmd)        
     s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
     out,err = MakeByte2str(s.communicate())
@@ -283 +298 @@
     if proxycmds: cmd += proxycmds
     #print(cmd)
+    showsvncmd(cmd)        
     s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
     out,err = MakeByte2str(s.communicate())