diff options
| author | agriffis <agriffis@gentoo.org> | 2004-11-09 14:34:21 +0000 |
|---|---|---|
| committer | agriffis <agriffis@gentoo.org> | 2004-11-09 14:34:21 +0000 |
| commit | 6ef917ef2259b269992265f37adc56217256db16 (patch) | |
| tree | c108138880ec4bc0bd76e1d1160d3e21400ca9fd | |
| parent | ec87a808c57c85f4a7794db85d39fc1dd3870b81 (diff) | |
| download | gentoolkit-6ef917ef2259b269992265f37adc56217256db16.tar.gz | |
change "cvs diff -fU 0" => "cvs -f diff U0" because -f is a global option, not a diff option
svn path=/; revision=168
| -rw-r--r-- | trunk/src/echangelog/ChangeLog | 4 | ||||
| -rw-r--r-- | trunk/src/echangelog/echangelog | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/trunk/src/echangelog/ChangeLog b/trunk/src/echangelog/ChangeLog index 059d937..26ea9b4 100644 --- a/trunk/src/echangelog/ChangeLog +++ b/trunk/src/echangelog/ChangeLog @@ -1,3 +1,7 @@ +09 Nov 2004 Aron Griffis <agriffis@gentoo.org> + * change "cvs diff -fU 0" => "cvs -f diff U0" because -f is a + global option, not a diff option + 08 Nov 2004 Aron Griffis <agriffis@gentoo.org> * call cvs with -f to refrain from using .cvsrc, which might contain conflicting options diff --git a/trunk/src/echangelog/echangelog b/trunk/src/echangelog/echangelog index 65b2edd..01b77f4 100644 --- a/trunk/src/echangelog/echangelog +++ b/trunk/src/echangelog/echangelog @@ -53,6 +53,7 @@ if (-f 'ChangeLog') { # Figure out what has changed around here open C, 'cvs -fn up 2>&1 |' or die "Can't run cvs -fn up: $!\n"; while (<C>) { + #print STDERR "cvs: $_"; /ChangeLog/ and next; /^\? (\S+)/ and push @unknown, $1; /^([ARMC]) (\S+)/ or next; @@ -72,10 +73,13 @@ EOT # the changed files we have @ebuilds = grep /\.ebuild$/, @files; @files = grep !/\.ebuild$/, @files; +#print STDERR '@ebuilds = [', join('],[', @ebuilds), "]\n"; +#print STDERR '@files = [', join('],[', @files), "]\n"; if (@ebuilds) { - open C, "cvs diff -fU 0 @ebuilds 2>&1 |" or die "Can't run cvs diff: $!\n"; + open C, "cvs -f diff -U0 @ebuilds 2>&1 |" or die "Can't run cvs diff: $!\n"; $_ = <C>; while (defined $_) { + #print STDERR "cvs: $_"; if (/^cvs diff: (([^\/]*?)\.ebuild) was removed/) { push @files, $1; $versions{$2} = 0; # existing ebuild that was removed |