Changeset 4645 for install


Ignore:
Timestamp:
Nov 3, 2020 6:19:08 PM (11 months ago)
Author:
toby
Message:

more workarounds for Mac svn checksum problem

Location:
install
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • install/bootstrap.py

    r4640 r4645  
    248248    return int(M)+int(m)/10.
    249249
     250def showsvncmd(cmd):
     251    s = '\nsvn command:  '
     252    for i in cmd: s += i + ' '
     253    print(s)
     254
    250255def svnChecksumPatch(svn,fpath,verstr):
    251256    '''This performs a fix when svn cannot finish an update because of
     
    255260    print('\nAttempting patch for svn Checksum mismatch error\n')
    256261    cmd = [svn,'cleanup',fpath]
     262    showsvncmd(cmd)       
    257263    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
    258264    out,err = MakeByte2str(s.communicate())
     
    260266    cmd = ['svn','update','--set-depth','empty',
    261267               os.path.join(fpath,'bindist')]
     268    showsvncmd(cmd)       
    262269    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
    263270    out,err = MakeByte2str(s.communicate())
     
    270277        msg += '\nGSAS-II will not run without correcting this. Contact toby@anl.gov'
    271278        BailOut(msg)
     279    cmd = ['svn','switch',g2home+'/trunk/bindist',
     280               os.path.join(fpath,'bindist'),
     281               '--non-interactive', '--trust-server-cert', '--accept',
     282               'theirs-conflict', '--force', '-rHEAD', '--ignore-ancestry']
     283    showsvncmd(cmd)       
     284    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
     285    out,err = MakeByte2str(s.communicate())
    272286    GSASIIpath.DownloadG2Binaries(g2home,verbose=True)
    273287    cmd = ['svn','update','--set-depth','infinity',
    274288               os.path.join(fpath,'bindist')]
     289    showsvncmd(cmd)       
    275290    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
    276291    out,err = MakeByte2str(s.communicate())
     
    283298    if proxycmds: cmd += proxycmds
    284299    #print(cmd)
     300    showsvncmd(cmd)       
    285301    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
    286302    out,err = MakeByte2str(s.communicate())
  • install/g2complete/src/bootstrap.py

    r4640 r4645  
    248248    return int(M)+int(m)/10.
    249249
     250def showsvncmd(cmd):
     251    s = '\nsvn command:  '
     252    for i in cmd: s += i + ' '
     253    print(s)
     254
    250255def svnChecksumPatch(svn,fpath,verstr):
    251256    '''This performs a fix when svn cannot finish an update because of
     
    255260    print('\nAttempting patch for svn Checksum mismatch error\n')
    256261    cmd = [svn,'cleanup',fpath]
     262    showsvncmd(cmd)       
    257263    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
    258264    out,err = MakeByte2str(s.communicate())
     
    260266    cmd = ['svn','update','--set-depth','empty',
    261267               os.path.join(fpath,'bindist')]
     268    showsvncmd(cmd)       
    262269    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
    263270    out,err = MakeByte2str(s.communicate())
     
    270277        msg += '\nGSAS-II will not run without correcting this. Contact toby@anl.gov'
    271278        BailOut(msg)
     279    cmd = ['svn','switch',g2home+'/trunk/bindist',
     280               os.path.join(fpath,'bindist'),
     281               '--non-interactive', '--trust-server-cert', '--accept',
     282               'theirs-conflict', '--force', '-rHEAD', '--ignore-ancestry']
     283    showsvncmd(cmd)       
     284    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
     285    out,err = MakeByte2str(s.communicate())
    272286    GSASIIpath.DownloadG2Binaries(g2home,verbose=True)
    273287    cmd = ['svn','update','--set-depth','infinity',
    274288               os.path.join(fpath,'bindist')]
     289    showsvncmd(cmd)       
    275290    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
    276291    out,err = MakeByte2str(s.communicate())
     
    283298    if proxycmds: cmd += proxycmds
    284299    #print(cmd)
     300    showsvncmd(cmd)       
    285301    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
    286302    out,err = MakeByte2str(s.communicate())
  • install/g2pkg/src/bootstrap.py

    r4640 r4645  
    248248    return int(M)+int(m)/10.
    249249
     250def showsvncmd(cmd):
     251    s = '\nsvn command:  '
     252    for i in cmd: s += i + ' '
     253    print(s)
     254
    250255def svnChecksumPatch(svn,fpath,verstr):
    251256    '''This performs a fix when svn cannot finish an update because of
     
    255260    print('\nAttempting patch for svn Checksum mismatch error\n')
    256261    cmd = [svn,'cleanup',fpath]
     262    showsvncmd(cmd)       
    257263    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
    258264    out,err = MakeByte2str(s.communicate())
     
    260266    cmd = ['svn','update','--set-depth','empty',
    261267               os.path.join(fpath,'bindist')]
     268    showsvncmd(cmd)       
    262269    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
    263270    out,err = MakeByte2str(s.communicate())
     
    270277        msg += '\nGSAS-II will not run without correcting this. Contact toby@anl.gov'
    271278        BailOut(msg)
     279    cmd = ['svn','switch',g2home+'/trunk/bindist',
     280               os.path.join(fpath,'bindist'),
     281               '--non-interactive', '--trust-server-cert', '--accept',
     282               'theirs-conflict', '--force', '-rHEAD', '--ignore-ancestry']
     283    showsvncmd(cmd)       
     284    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
     285    out,err = MakeByte2str(s.communicate())
    272286    GSASIIpath.DownloadG2Binaries(g2home,verbose=True)
    273287    cmd = ['svn','update','--set-depth','infinity',
    274288               os.path.join(fpath,'bindist')]
     289    showsvncmd(cmd)       
    275290    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
    276291    out,err = MakeByte2str(s.communicate())
     
    283298    if proxycmds: cmd += proxycmds
    284299    #print(cmd)
     300    showsvncmd(cmd)       
    285301    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
    286302    out,err = MakeByte2str(s.communicate())
Note: See TracChangeset for help on using the changeset viewer.