Changeset 2923 for branch


Ignore:
Timestamp:
Jul 8, 2017 3:12:16 PM (4 years ago)
Author:
toby
Message:

add fixes

Location:
branch/2frame
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branch/2frame/GSASIIctrlGUI.py

    r2921 r2923  
    37463746        '''
    37473747        testbranch = '/branch/2frame'
    3748         if GSASIIpath.svnTestBranch():
     3748        if not GSASIIpath.svnTestBranch():
    37493749            dlg = wx.MessageDialog(self.frame,
    3750                                    'Switching from test to standard GSAS-II version',
     3750                                   'Switching to test GSAS-II version',
    37513751                                   'Confirm Switch',
    37523752                                   wx.OK|wx.CANCEL)
  • branch/2frame/GSASIIpath.py

    r2922 r2923  
    391391    if proxycmds: cmd += proxycmds
    392392    if verbose: print(u"Loading files to "+fpath+u"\n  from "+URL)
    393     print cmd
    394393    s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
    395394    out,err = s.communicate()
     
    763762        print("Update to current version")
    764763        svnUpdateDir(loc)
    765     print sys.executable
     764    ex = sys.executable
     765    if sys.platform == "darwin": # mac requires pythonw which is not always reported as sys.executable
     766        if os.path.exists(ex+'w'): ex += 'w'
    766767    if project:
    767768        print("Restart GSAS-II with project file "+str(project))
    768         subprocess.Popen([sys.executable,os.path.join(loc,'GSASII.py'),project])
     769        subprocess.Popen([ex,os.path.join(loc,'GSASII.py'),project])
    769770    else:
    770771        print("Restart GSAS-II without a project file ")
    771         subprocess.Popen([sys.executable,os.path.join(loc,'GSASII.py')])
     772        subprocess.Popen([ex,os.path.join(loc,'GSASII.py')])
    772773    print 'exiting update process'
    773774    sys.exit()
Note: See TracChangeset for help on using the changeset viewer.