From bae764541ddcccd706fe86d7b9a3999dd0bfd62f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simo=20F=C3=A4lt?= <simo.falt@digia.com>
Date: Mon, 13 May 2013 08:26:01 +0300
Subject: [PATCH] Fix for Qt Submodule Update jobs
Add qtgitreadonly mirror as baseurl for submodules, which have
relative url in .gitmodules.
Change-Id: I114aced602358b259e78827345cb534ca30fd354
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
scripts/qt/qt_update_submodules.pl | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/scripts/qt/qt_update_submodules.pl b/scripts/qt/qt_update_submodules.pl
index c72f4e13..325b457c 100755
--- a/scripts/qt/qt_update_submodules.pl
+++ b/scripts/qt/qt_update_submodules.pl
@@ -266,6 +266,11 @@ sub update_submodule
confess "Command `@cmd' did not output a giturl";
}
+ # .gitmodules may contain relative path for submodules
+ if ($giturl eq "../$submodule.git") {
+ $giturl = catfile("qtgitreadonly:qt", "$submodule.git");
+ }
+
chdir catfile($base_dir, $submodule);
$self->exe( qw(git fetch --verbose), $giturl, "+$ref:refs/heads/updated_submodule" );
--
GitLab