diff options
| author | Jos I. Boumans <kane@dwim.org> | 2007-10-04 13:24:05 +0200 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2007-10-05 08:09:58 +0000 |
| commit | 1df59df4ebcab37761aa39263671effe1aa83486 (patch) | |
| tree | 887d166586c8bcb6ec0d41a2458f6d5e549395ce | |
| parent | 17d4810c15c2b7b12d8a06515de5fdeeb75f54cb (diff) | |
| download | perl-1df59df4ebcab37761aa39263671effe1aa83486.tar.gz | |
Update add-package.pl
From: "Jos I. Boumans" <jos@dwim.org>
Message-Id: <9D8CA217-8B5B-487E-96A4-92D9047FE921@dwim.org>
p4raw-id: //depot/perl@32030
| -rw-r--r-- | Porting/add-package.pl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Porting/add-package.pl b/Porting/add-package.pl index db4c531671..b403bcaba0 100644 --- a/Porting/add-package.pl +++ b/Porting/add-package.pl @@ -407,14 +407,20 @@ my @NewFiles; if( $RunDiff ) { my $diff = $Repo; $diff =~ s/$$/patch/; - print "Generating diff..." if $Verbose; - ### weird RV ;( my $master = basename( $MasterRepo ); my $repo = basename( $Repo ); my $chdir = dirname( $MasterRepo ); - system( "cd $chdir; diff -ruN $master $repo > $diff" ); + ### the .patch file is added by an rsync from the APC + ### but isn't actually in the p4 repo, so exclude it + my $cmd = "cd $chdir; diff -ruN --exclude=.patch $master $repo > $diff"; + + print "Running: '$cmd'\n"; + + print "Generating diff..." if $Verbose; + + system( $cmd ); #and die "Could not write diff to '$diff': $?"; die "Could not write diff to '$diff'" unless -e $diff && -s _; |