Changeset 5413 for install/g2pkg/src

Timestamp:

Nov 27, 2022 10:43:12 PM (6 months ago)

Author:

toby

Message:

svn fixes for new windows pkging

File:

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

install/g2pkg/src/bootstrap.py

@@ -299 +299 @@
     print('\nAttempting patch for svn Checksum mismatch error\n')
     svncleanup(fpath)
-    cmd = ['svn','update','--set-depth','empty',
+    cmd = [svn,'update','--set-depth','empty',
                os.path.join(fpath,'bindist')]
     showsvncmd(cmd)        
@@ -314 +314 @@
         print(err)
         BailOut(msg)
-    cmd = ['svn','switch',g2home+'/trunk/bindist',
+    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)        
+    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',
+    cmd = [svn,'update','--set-depth','infinity',
                os.path.join(fpath,'bindist')]
     showsvncmd(cmd)