Changeset 1555

Timestamp:

Nov 1, 2014 6:29:04 PM (8 years ago)

Author:

toby

Message:

add trust opt to svn update

File:

• trunk/GSASIIpath.py (modified) (1 diff)

trunk/GSASIIpath.py

@@ -276 +276 @@
            '--non-interactive',
            '--accept','theirs-conflict','--force']
-    s = subprocess.Popen(cmd, 
+    s = subprocess.Popen(cmd+'[--trust-server-cert'], 
                          stdout=subprocess.PIPE,stderr=subprocess.PIPE)
     out,err = s.communicate()
     print out
     if err:
-        print(60*"=")
-        print ("****** An error was noted, see below *********")
-        print(60*"=")
-        print err
-        sys.exit()
+        s = subprocess.Popen(cmd,
+                         stdout=subprocess.PIPE,stderr=subprocess.PIPE)
+        out,err = s.communicate()
+        if err:
+            print(60*"=")
+            print ("****** An error was noted, see below *********")
+            print(60*"=")
+            print err
+            sys.exit()
 
 def svnUpdateProcess(version=None,projectfile=None):