projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c5dbacb
)
update to work with current packages file format
author
Simon Marlow
<marlowsd@gmail.com>
Wed, 12 Jan 2011 16:02:24 +0000
(16:02 +0000)
committer
Simon Marlow
<marlowsd@gmail.com>
Wed, 12 Jan 2011 16:02:24 +0000
(16:02 +0000)
sync-all
patch
|
blob
|
history
diff --git
a/sync-all
b/sync-all
index
1de4fe3
..
9db2dbb
100644
(file)
--- a/
sync-all
+++ b/
sync-all
@@
-39,7
+39,7
@@
my $local_repo_unnecessary = 0;
# Always define the empty tag so that we fetch the /required/ packages
my %tags;
# Always define the empty tag so that we fetch the /required/ packages
my %tags;
-$tags{""} = 1;
+$tags{"-"} = 1;
sub message {
if ($verbose >= 2) {
sub message {
if ($verbose >= 2) {
@@
-80,6
+80,7
@@
sub scmall {
my $tag;
my $remotepath;
my $scm;
my $tag;
my $remotepath;
my $scm;
+ my $upstream;
my $path;
my $wd_before = getcwd;
my $path;
my $wd_before = getcwd;
@@
-89,11
+90,12
@@
sub scmall {
open IN, "< packages" or die "Can't open packages file";
while (<IN>) {
chomp;
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;
$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"));
# Check the SCM is OK as early as possible
die "Unknown SCM: $scm" if (($scm ne "darcs") and ($scm ne "git"));