X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=darcs-all;h=1e773c92f1e9c9bf66f042650ff00c15b1c1fdad;hb=a28ba79a751ec22728e9bdf4184524d72b038339;hp=7743e8a857eddd2a51457d36e6238319a19bfced;hpb=c6eadadbefe2ec5709e9d31893f79c4ff78754b4;p=ghc-hetmet.git

diff --git a/darcs-all b/darcs-all
index 7743e8a..1e773c9 100644
--- a/darcs-all
+++ b/darcs-all
@@ -31,7 +31,7 @@ else {
     die "Couldn't work out defaultrepo";
 }
 
-my $verbose = 1;
+my $verbose = 2;
 my $ignore_failure = 0;
 
 # --extra says we grab the extra libs with 'get'.  It has no effect on
@@ -43,13 +43,15 @@ my $nofib = 0;
 my $testsuite = 0;
 
 sub message {
-    if ($verbose) {
+    if ($verbose >= 2) {
         print "@_\n";
     }
 }
 
 sub warning {
-    print "warning: @_\n";
+    if ($verbose >= 1) {
+        print "warning: @_\n";
+    }
 }
 
 sub darcs {
@@ -132,6 +134,9 @@ sub main {
         # 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 = 1;
+        }
+        elsif ($arg eq "-s") {
             $verbose = 0;
         }
         elsif ($arg eq "--extra") {
@@ -146,7 +151,7 @@ sub main {
         else {
             unshift @_, $arg;
             if (grep /^-q$/, @_) {
-                $verbose = 0;
+                $verbose = 1;
             }
             last;
         }