X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=darcs-all;h=24ed6f482a3a872c0aaf5f1f024f066ea335cc83;hp=70cf16506ebfc88486b4f34ff6ab2b37bd191608;hb=6a05ec5ef5373f61b7f9f5bdc344483417fa801b;hpb=56bf673097811e7fa362ae3741f6ff4ea872475b

diff --git a/darcs-all b/darcs-all
index 70cf165..24ed6f4 100644
--- a/darcs-all
+++ b/darcs-all
@@ -14,11 +14,16 @@ 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 =~ /^\//) {
-    # Local filesystem (assumes a checked-out tree):
+    # 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):
     $defaultrepo_base = $defaultrepo;
     $defaultrepo_lib = "$defaultrepo/libraries";
 }
@@ -26,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
@@ -38,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 {
@@ -64,7 +71,7 @@ sub darcsall {
             message "== $dir not present or not a repository; skipping";
         }
     }
-    for my $pkg (`cat libraries/core-packages libraries/extra-packages`) {
+    for my $pkg (`cat libraries/boot-packages libraries/extra-packages`) {
         chomp $pkg;
         if (-d "libraries/$pkg") {
             darcs (@_, "--repodir", "libraries/$pkg");
@@ -105,10 +112,10 @@ sub darcsget {
 
     my @packages;
     if ($extra) {
-        @packages = `cat core-packages extra-packages`;
+        @packages = `cat boot-packages extra-packages`;
     }
     else {
-        @packages = `cat core-packages`;
+        @packages = `cat boot-packages`;
     }
 
     for my $pkg (@packages) {
@@ -124,7 +131,12 @@ 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 = 1;
+        }
+        elsif ($arg eq "-s") {
             $verbose = 0;
         }
         elsif ($arg eq "--extra") {
@@ -138,6 +150,9 @@ sub main {
         }
         else {
             unshift @_, $arg;
+            if (grep /^-q$/, @_) {
+                $verbose = 1;
+            }
             last;
         }
     }