X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=darcs-all;h=72e1ed33541b6606a588d19fe035d75c17485443;hp=70cf16506ebfc88486b4f34ff6ab2b37bd191608;hb=8a2809c29de9f23eba7ca682b48390033a9d40f6;hpb=56bf673097811e7fa362ae3741f6ff4ea872475b

diff --git a/darcs-all b/darcs-all
index 70cf165..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 =~ /^\//) {
@@ -124,6 +124,8 @@ sub main {
 
     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;
         }
@@ -138,6 +140,9 @@ sub main {
         }
         else {
             unshift @_, $arg;
+            if (grep /^-q$/, @_) {
+                $verbose = 0;
+            }
             last;
         }
     }