X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=darcs-all;h=24ed6f482a3a872c0aaf5f1f024f066ea335cc83;hp=f1934dcdb20aae2739bafd591033a32f63336835;hb=2a4d586c8abefa2b0d2a782c421697fd6cf0c964;hpb=5822cb8d13aa3c05d2b46b4510c13d94b902eb21

diff --git a/darcs-all b/darcs-all
index f1934dc..24ed6f4 100644
--- a/darcs-all
+++ b/darcs-all
@@ -11,14 +11,13 @@ chomp $defaultrepo;
 my $defaultrepo_base;
 my $defaultrepo_lib;
 
-if ($defaultrepo =~ /:\/\//) {		
+if ($defaultrepo =~ /:/) {
     # HTTP or SSH
     $defaultrepo_base = $defaultrepo;
     $defaultrepo_base =~ s#/[^/]+/?$##;
     $defaultrepo_lib = "$defaultrepo_base/packages";
 }
-elsif (($defaultrepo =~ /^\//) or 	# unix
-       ($defaultrepo =~ /^.:/)) {	# windows, e.g. c:
+elsif ($defaultrepo =~ /^\//) {
     # Local filesystem, absolute path (assumes a checked-out tree):
     $defaultrepo_base = $defaultrepo;
     $defaultrepo_lib = "$defaultrepo/libraries";
@@ -32,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
@@ -44,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 {
@@ -70,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");
@@ -111,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) {
@@ -133,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") {
@@ -147,7 +151,7 @@ sub main {
         else {
             unshift @_, $arg;
             if (grep /^-q$/, @_) {
-                $verbose = 0;
+                $verbose = 1;
             }
             last;
         }