Changeset 5069

Timestamp:

Nov 6, 2021 12:32:37 AM (23 months ago)

Author:

toby

Message:

Make svn location a config option

Location:

trunk

Files:

• GSASIIpath.py (modified) (3 diffs)
• config_example.py (modified) (1 diff)

trunk/GSASIIpath.py

@@ -253 +253 @@
     if GetConfigValue('debug') and host:
         print('DBG_Using proxy host {} port {}'.format(host,port))
+    if GetConfigValue('svn_exec'):
+        exe_file = GetConfigValue('svn_exec')
+        print('Using ',exe_file)
+        if is_exe(exe_file):
+            try:
+                p = subprocess.Popen([exe_file,'help'],stdout=subprocess.PIPE)
+                res = p.stdout.read()
+                if not res: return
+                p.communicate()
+                svnLocCache = os.path.abspath(exe_file)
+                return svnLocCache
+            except:
+                pass
     # add likely places to find subversion when installed with GSAS-II
     pathlist = os.environ["PATH"].split(os.pathsep)
@@ -1157 +1170 @@
     newpath = os.path.join(path2GSAS2,'exports')
     if newpath not in sys.path: sys.path.append(newpath)
-
+    LoadConfig(printInfo)
+
+def LoadConfig(printInfo=True):
     # setup read of config.py, if present
     global configDict
@@ -1301 +1316 @@
     '''What follows is called to update (or downdate) GSAS-II in a separate process. 
     '''
+    LoadConfig()
     import time
     time.sleep(1) # delay to give the main process a chance to exit

trunk/config_example.py

@@ -267 +267 @@
 This option is under development and is not fully tested. 
 '''
+
+svn_exec = None
+'''Defines the full path to a subversion executable. 
+If None (the default), GSAS-II will search for a svn or svn.exe file 
+in the current path or in the location where the current Python is located.
+'''