diff options
| author | abs <abs@pkgsrc.org> | 2001-05-24 17:02:44 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2001-05-24 17:02:44 +0000 |
| commit | bc0f328ba44a9b7c78e8ca2b47fc5f9065193e7e (patch) | |
| tree | fc14126c096eb364e0ac4748394916f20cb7c2f2 | |
| parent | 9e1204af76f955eb27ef01ceaa3463843c5063bf (diff) | |
| download | pkgsrc-bc0f328ba44a9b7c78e8ca2b47fc5f9065193e7e.tar.gz | |
Update pkgdiff to 0.100
if pkgdiff failed due to a problem with RCS ids, mkpatches would save the
failure message as a patch. Change to abort if pkgdiff has a non zero exit
(with the pkgdiff output). Also add a '-v' flag to indicate which .orig
file is being associated with which patchfile as processed.
| -rw-r--r-- | pkgtools/pkgdiff/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkgdiff/files/mkpatches.pl | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile index dfdb858e2e5..b12d3ea004f 100644 --- a/pkgtools/pkgdiff/Makefile +++ b/pkgtools/pkgdiff/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2001/03/31 20:19:03 skrll Exp $ +# $NetBSD: Makefile,v 1.13 2001/05/24 17:02:44 abs Exp $ # -DISTNAME= pkgdiff-0.99 +DISTNAME= pkgdiff-0.100 CATEGORIES= pkgtools devel MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkgdiff/files/mkpatches.pl b/pkgtools/pkgdiff/files/mkpatches.pl index 2e9dfda2a64..4214d34b322 100755 --- a/pkgtools/pkgdiff/files/mkpatches.pl +++ b/pkgtools/pkgdiff/files/mkpatches.pl @@ -1,6 +1,6 @@ #!@PREFIX@/bin/perl # -# $NetBSD: mkpatches.pl,v 1.4 2001/03/31 17:24:03 skrll Exp $ +# $NetBSD: mkpatches.pl,v 1.5 2001/05/24 17:02:44 abs Exp $ # # mkpatches: creates a set of patches patch-aa, patch-ab, ... # in work/.newpatches by looking for *.orig files in and below @@ -34,7 +34,7 @@ sub create_patchdir { # read command line arguments -getopts('d:h'); +getopts('d:hv'); if ($opt_h) { ($prog) = ($0 =~ /([^\/]+)$/); @@ -42,6 +42,7 @@ if ($opt_h) { usage: $prog [-d output-directory] -d dirname directory to put the resulting patches into; defaults to \$WRKDIR/.newpatches + -v verbose - list .orig files as processed EOF exit 0; }; @@ -87,7 +88,14 @@ foreach (sort <handle>) { if ( -f $complete ) { $patchfile = ("aa".."zz")[$l]; $patchfile =~ s/^/patch-/; + if ($opt_v) { + print "$patchfile -> $complete\n"; + } $diff=`pkgdiff $old $new`; + if ( $? ) { + print "$old\n$diff\n"; + exit 1; + } if ( "$diff" eq "" ) { print ("$new and $old don't differ\n"); } else { |