diff options
| author | abs <abs@pkgsrc.org> | 2004-06-30 09:53:42 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2004-06-30 09:53:42 +0000 |
| commit | b9736451b3f41058334b7af8f69fc7fb6aa99228 (patch) | |
| tree | 877ad967b4855462e6df366348835f36adddcab0 /pkgtools | |
| parent | f5e08f6c353a21a9c61e2cf73446280c9ccf6172 (diff) | |
| download | pkgsrc-b9736451b3f41058334b7af8f69fc7fb6aa99228.tar.gz | |
Update pkg_chk to 1.49:
When -v (verbose) is given with -l (list binary packages required for
target config), display which package pulled in a particular dependency
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_chk/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkg_chk/files/pkg_chk.sh | 37 |
2 files changed, 21 insertions, 20 deletions
diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile index c889a22a737..5aab8ebbc11 100644 --- a/pkgtools/pkg_chk/Makefile +++ b/pkgtools/pkg_chk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2004/05/09 17:56:17 abs Exp $ +# $NetBSD: Makefile,v 1.6 2004/06/30 09:53:42 abs Exp $ -DISTNAME= pkg_chk-1.48 +DISTNAME= pkg_chk-1.49 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkg_chk/files/pkg_chk.sh b/pkgtools/pkg_chk/files/pkg_chk.sh index 9998f9d20de..3a834d990a4 100755 --- a/pkgtools/pkg_chk/files/pkg_chk.sh +++ b/pkgtools/pkg_chk/files/pkg_chk.sh @@ -1,6 +1,6 @@ #!@SH@ -e # -# $Id: pkg_chk.sh,v 1.5 2004/05/09 17:56:17 abs Exp $ +# $Id: pkg_chk.sh,v 1.6 2004/06/30 09:53:42 abs Exp $ # # TODO: Handle updates with dependencies via binary packages @@ -53,11 +53,11 @@ check_packages_installed() echo "$PKGNAME: build version information mismatch" MISMATCH_TODO="$MISMATCH_TODO $PKGNAME" # should we mark this pkg to be updated if -u is given ?? - elif [ -n "$opt_v" ];then - echo "$PKGNAME: OK" + else + verbose "$PKGNAME: OK" fi - elif [ -n "$opt_v" ];then - echo "$PKGNAME: OK" + else + verbose "$PKGNAME: OK" fi fi done @@ -85,9 +85,7 @@ list_packages() fi continue fi - if [ -n "$opt_v" ];then - echo "$PKGNAME.tgz: found" - fi + verbose "$PKGNAME.tgz: found" CHECKLIST="$CHECKLIST$PKGNAME "; done while [ "$CHECKLIST" != ' ' ]; do @@ -104,14 +102,12 @@ list_packages() for dep in $(pkg_info -N $PACKAGES/All/$pkg.tgz | ${SED} '1,/Built using:/d' | ${GREP} ..) ; do case "$PKGLIST$NEXTCHECK" in *\ $dep\ *) - if [ -n "$opt_v" ];then - echo "Duplicate depend $dep" - fi;; + verbose "$pkg: Duplicate depend $dep" + ;; *) NEXTCHECK="$NEXTCHECK$dep " - if [ -n "$opt_v" ];then - echo "Add depend $dep" - fi;; + verbose "$pkg: Add depend $dep" + ;; esac done done @@ -304,6 +300,13 @@ run_cmd() fi } +verbose() + { + if [ -n "$opt_v" ];then + echo $* + fi + } + args=$(getopt BC:D:L:U:abcfghiklnrsuv $*) if [ $? != 0 ]; then opt_h=1 @@ -452,10 +455,8 @@ if [ -n "$opt_c" -o -n "$opt_l" ];then if [ -n "$opt_D" ];then TAGS="$TAGS,$opt_D" fi - if [ -n "$opt_v" ];then - echo "set TAGS=$TAGS" - echo "unset TAGS=$opt_U" - fi + verbose "set TAGS=$TAGS" + verbose "unset TAGS=$opt_U" # Extract list of valid pkgdirs (skip any 'alreadyset' in $PKGDIRLIST) # |