Changeset 1553

Timestamp:

Nov 1, 2014 6:09:10 PM (9 years ago)

Author:

toby

Message:

fix .bat file for paths with spaces; start on svn -trust changes

Location:

trunk

Files:

• GSASII.BAT (modified) (1 diff)
• GSASIIpath.py (modified) (2 diffs)

trunk/GSASII.BAT

@@ -15 +15 @@
 @set gsasloc=%gsasloc:\*=\%
 @
-python %gsasloc%\GSASII.py %1
+python "%gsasloc%\GSASII.py" "%1"
 @REM To keep the window from disappearing with any error messages
 pause

trunk/GSASIIpath.py

@@ -211 +211 @@
     else:
         cmd = [svn,'info',fpath,'--xml','-rHEAD']
-    s = subprocess.Popen(cmd,
+    s = subprocess.Popen(cmd+['--non-interactive', '--trust-server-cert'],
                          stdout=subprocess.PIPE,stderr=subprocess.PIPE)
     out,err = s.communicate()
@@ -217 +217 @@
         print 'out=',out
         print 'err=',err
-        return None
+        s = subprocess.Popen(cmd,
+                            stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+        out,err = s.communicate()
+        if err:
+            print 'out=',out
+            print 'err=',err
+            return None
     x = ET.fromstring(out)
     for i in x.iter('entry'):