Remove some redundancy in darcs-all

[ghc-hetmet.git] / darcs-all

diff --git a/darcs-all b/darcs-all
index 046e589..82245fb 100644 (file)
--- a/darcs-all
+++ b/darcs-all
@@ -11,19 +11,17 @@ chomp $defaultrepo;
 my $defaultrepo_base;
 my $defaultrepo_lib;
 
-if ($defaultrepo =~ /:/) {
+if ($defaultrepo =~ /^...*:/) {
     # HTTP or SSH
+    # Above regex says "at least two chars before the :", to avoid
+    # catching Win32 drives ("C:\").
     $defaultrepo_base = $defaultrepo;
     $defaultrepo_base =~ s#/[^/]+/?$##;
     $defaultrepo_lib = "$defaultrepo_base/packages";
 }
-elsif ($defaultrepo =~ /^\//) {
-    # Local filesystem, absolute path (assumes a checked-out tree):
-    $defaultrepo_base = $defaultrepo;
-    $defaultrepo_lib = "$defaultrepo/libraries";
-}
-elsif ($defaultrepo =~ /^..\//) {
-    # Local filesystem, relative path (assumes a checked-out tree):
+elsif ($defaultrepo =~ /^(\.\.)?\//) {
+    # Local filesystem, either absolute or relative path
+    # (assumes a checked-out tree):
     $defaultrepo_base = $defaultrepo;
     $defaultrepo_lib = "$defaultrepo/libraries";
 }
@@ -76,11 +74,7 @@ sub darcsall {
         chomp $path;
         if ($path =~ m#/(.*)/#) {
             my $pkg = $1;
-            # bootstrapping.* are just copies of other repos; we don't
-            # update them directly.
-            if ($pkg !~ /bootstrapping/) {
-                darcs (@_, "--repodir", "libraries/$pkg");
-            }
+            darcs (@_, "--repodir", "libraries/$pkg");
         }
         else {
             die "that pattern can't fail!";