# Always define the empty tag so that we fetch the /required/ packages
my %tags;
-$tags{""} = 1;
+$tags{"-"} = 1;
sub message {
if ($verbose >= 2) {
my $tag;
my $remotepath;
my $scm;
+ my $upstream;
my $path;
my $wd_before = getcwd;
open IN, "< packages" or die "Can't open packages file";
while (<IN>) {
chomp;
- if (/^([^# ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+)$/) {
+ if (/^([^# ]+) +(?:([^ ]+) +)?([^ ]+) +([^ ]+) +([^ ]+)$/) {
$localpath = $1;
$tag = defined($2) ? $2 : "";
$remotepath = $3;
$scm = $4;
+ $upstream = $5;
# Check the SCM is OK as early as possible
die "Unknown SCM: $scm" if (($scm ne "darcs") and ($scm ne "git"));
elsif ($arg eq "--ignore-failure") {
$ignore_failure = 1;
}
+ elsif ($arg eq "--complete" || $arg eq "--partial") {
+ $get_mode = $arg;
+ }
# --<tag> says we grab the libs tagged 'tag' with
# 'get'. It has no effect on the other commands.
elsif ($arg =~ m/^--/) {
$arg =~ s/^--//;
$tags{$arg} = 1;
}
- elsif ($arg eq "--complete" || $arg eq "--partial") {
- $get_mode = $arg;
- }
else {
unshift @_, $arg;
if (grep /^-q$/, @_) {