From 423701201caf1f1a3af3d6673817957125b890b0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Aguerre?= Date: Tue, 9 May 2017 17:10:23 +0200 Subject: [PATCH] Fix remote address of qttesting repo --- scripts/salome_download.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 -- 2.39.2