From: Cédric Aguerre <cedric.aguerre@edf.fr>
Date: Tue, 9 May 2017 15:10:23 +0000 (+0200)
Subject: Fix remote address of qttesting repo
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=423701201caf1f1a3af3d6673817957125b890b0;p=tools%2Fpvdeliv.git

Fix remote address of qttesting repo
---

diff --git a/scripts/salome_download.py b/scripts/salome_download.py
index 1fcdd4b..dbbcd56 100644
--- a/scripts/salome_download.py
+++ b/scripts/salome_download.py
@@ -59,7 +59,7 @@ internal_submodules = {
   }
 external_submodules = {
   'ThirdParty/IceT/vtkicet': 'https://gitlab.kitware.com/icet/icet.git',
-  'ThirdParty/QtTesting/vtkqttesting': 'https://github.com/Kitware/QtTesting.git',
+  'ThirdParty/QtTesting/vtkqttesting': 'https://gitlab.kitware.com/paraview/qttesting.git',
   'ThirdParty/protobuf/vtkprotobuf': 'https://gitlab.kitware.com/paraview/protobuf.git',
   'Utilities/VisItBridge': 'https://gitlab.kitware.com/paraview/visitbridge.git',
   'VTK': 'https://gitlab.kitware.com/vtk/vtk.git',
@@ -130,7 +130,8 @@ def __extractSrcFromGit(gitLoc,srcDir,pattern,use_pleiade_mirrors=False):
     p=subprocess.Popen(["git","checkout",gitLoc[1]],cwd=dirGitLoc)
     p_out,p_err=p.communicate()
     if p.returncode != 0:
-      msg = "Error in checkout\n" + p_err
+      msg = "Error in checkout\n"
+      if p_err: msg += p_err
       raise Exception(msg)
 
     # Init and Update submodules
@@ -138,12 +139,14 @@ def __extractSrcFromGit(gitLoc,srcDir,pattern,use_pleiade_mirrors=False):
       p=subprocess.Popen(["git","submodule","update","--init","--recursive"],cwd=dirGitLoc)
       p.communicate()
       if p.returncode != 0:
-        msg = "Error in submodule update\n" + p_err
+        msg = "Error in submodule update\n"
+        if p_err: msg += p_err
         raise Exception(msg)
       p=subprocess.Popen(["git","checkout","--",".gitmodules"],cwd=dirGitLoc)
       p.communicate()
       if p.returncode != 0:
-        msg = "Error in submodule update\n" + p_err
+        msg = "Error in submodule update\n"
+        if p_err: msg += p_err
         raise Exception(msg)
 
     return ret