[commit: ghc] master: Fix sync-all get from a local working copy (4bf3aa2)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4bf3aa23d76c0e9ef88b382e4edfbfa847bd6bb5/ghc

>---------------------------------------------------------------

commit 4bf3aa23d76c0e9ef88b382e4edfbfa847bd6bb5
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Wed Jun 25 19:36:22 2014 -0700

    Fix sync-all get from a local working copy


>---------------------------------------------------------------

4bf3aa23d76c0e9ef88b382e4edfbfa847bd6bb5
 sync-all | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sync-all b/sync-all
index 571586c..517d4ff 100755
--- a/sync-all
+++ b/sync-all
@@ -566,14 +566,14 @@ sub gitInitSubmodules {
 
     my $submodulespaths = &readgit(".", "config", "--get-regexp", "^submodule[.].*[.]url");
     # if we came from github, change the urls appropriately
-    while ($submodulespaths =~ m!^(submodule.(?:libraries|utils)/[a-zA-Z0-9-]+.url) ($GITHUB)/ghc/packages/([a-zA-Z0-9-]+).git$!gm) {
+    while ($submodulespaths =~ m!^(submodule.(?:libraries/|utils/)?[a-zA-Z0-9-]+.url) ($GITHUB)/ghc/packages/([a-zA-Z0-9-]+).git$!gm) {
         &git(".", "config", $1, "$2/ghc/packages-$3");
     }
 
     # if we came from a local repository, grab our submodules from their
     # checkouts over there, if they exist.
     if ($repo_local) {
-        while ($submodulespaths =~ m!^(submodule.((?:libraries|utils)/[a-zA-Z0-9-]+).url) .*$!gm) {
+        while ($submodulespaths =~ m!^(submodule.((?:libraries/|utils/)?[a-zA-Z0-9-]+).url) .*$!gm) {
             if (-e "$repo_base/$2/.git") {
                 &git(".", "config", $1, "$repo_base/$2");
             }