X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=darcs-all;h=4e6768335585358394a573a4110ee827bbfbbd52;hb=65b5fb0ff8dd2af5c8bed6db5f059b4f60eb05de;hp=30173c2fa57b56e166d5ca679f74a140d991815f;hpb=610379bc0660cc9df6bb8cfaa98e566157236026;p=ghc-hetmet.git

diff --git a/darcs-all b/darcs-all
index 30173c2..4e67683 100644
--- a/darcs-all
+++ b/darcs-all
@@ -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?";
     }