if ($defaultrepo =~ /:/) {
# HTTP or SSH
$defaultrepo_base = $defaultrepo;
- $defaultrepo_base =~ s#/ghc$##;
+ $defaultrepo_base =~ s#/[^/]+/?$##;
$defaultrepo_lib = "$defaultrepo_base/packages";
}
elsif ($defaultrepo =~ /^\//) {
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";
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?";
}