X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=darcs-all;h=72e1ed33541b6606a588d19fe035d75c17485443;hp=30173c2fa57b56e166d5ca679f74a140d991815f;hb=2eb04ca0f8d0ec72b417cddc60672c696b4a3daa;hpb=610379bc0660cc9df6bb8cfaa98e566157236026

diff --git a/darcs-all b/darcs-all
index 30173c2..72e1ed3 100644
--- a/darcs-all
+++ b/darcs-all
@@ -14,7 +14,7 @@ my $defaultrepo_lib;
 if ($defaultrepo =~ /:/) {
     # HTTP or SSH
     $defaultrepo_base = $defaultrepo;
-    $defaultrepo_base =~ s#/ghc$##;
+    $defaultrepo_base =~ s#/[^/]+/?$##;
     $defaultrepo_lib = "$defaultrepo_base/packages";
 }
 elsif ($defaultrepo =~ /^\//) {
@@ -37,26 +37,6 @@ my $extra = 0;
 my $nofib = 0;
 my $testsuite = 0;
 
-while ($#_ ne -1) {
-    my $arg = shift;
-    if ($arg eq "-q") {
-        $verbose = 0;
-    }
-    elsif ($arg eq "--extra") {
-        $extra = 1;
-    }
-    elsif ($arg eq "--nofib") {
-        $nofib = 1;
-    }
-    elsif ($arg eq "--testsuite") {
-        $testsuite = 1;
-    }
-    else {
-        unshift @_, $arg;
-        last;
-    }
-}
-
 sub message {
     if ($verbose) {
         print "@_\n";
@@ -142,6 +122,31 @@ sub main {
         die "error: darcs-all must be run from the top level of the ghc tree."
     }
 
+    while ($#_ ne -1) {
+        my $arg = shift;
+        # We handle -q here as well as lower down as we need to skip over it
+        # if it comes before the darcs command
+        if ($arg eq "-q") {
+            $verbose = 0;
+        }
+        elsif ($arg eq "--extra") {
+            $extra = 1;
+        }
+        elsif ($arg eq "--nofib") {
+            $nofib = 1;
+        }
+        elsif ($arg eq "--testsuite") {
+            $testsuite = 1;
+        }
+        else {
+            unshift @_, $arg;
+            if (grep /^-q$/, @_) {
+                $verbose = 0;
+            }
+            last;
+        }
+    }
+
     if ($#_ eq -1) {
         die "What do you want to do?";
     }