diff options
| author | abs <abs@pkgsrc.org> | 2012-08-02 09:39:49 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2012-08-02 09:39:49 +0000 |
| commit | dd04b48a4af1264cc9e6b8fa00fb91bc5444e9e7 (patch) | |
| tree | ac7caadbf87feb8517905f5eebf442eab295aaf5 | |
| parent | cee83ff46ee0ab118296a83b7dc605111d496c65 (diff) | |
| download | pkgsrc-dd04b48a4af1264cc9e6b8fa00fb91bc5444e9e7.tar.gz | |
Updated pkgtools/pkg_chk to 2.0.3
PR#46760 pkgtools/pkg_chk /tmp/pkg_chk.XXXXXa directories
- Ensure tmpdir is removed in the -g and -p case
| -rw-r--r-- | pkgtools/pkg_chk/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkg_chk/files/pkg_chk.sh | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile index 35504de80bf..6d1b6c09010 100644 --- a/pkgtools/pkg_chk/Makefile +++ b/pkgtools/pkg_chk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.77 2012/07/29 17:31:11 abs Exp $ +# $NetBSD: Makefile,v 1.78 2012/08/02 09:39:49 abs Exp $ -DISTNAME= pkg_chk-2.0.2 +DISTNAME= pkg_chk-2.0.3 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 e3b49fe22d7..77c956a425c 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.67 2012/07/29 17:31:11 abs Exp $ +# $Id: pkg_chk.sh,v 1.68 2012/08/02 09:39:49 abs Exp $ # # TODO: Make -g check dependencies and tsort # TODO: Make -g list user-installed packages first, followed by commented @@ -747,8 +747,7 @@ if [ -z "$opt_b" -a -z "$opt_s" ];then opt_b=1; opt_s=1; fi -if [ -z "$opt_a$opt_g$opt_l$opt_p$opt_r$opt_u$opt_N" ]; -then +if [ -z "$opt_a$opt_g$opt_l$opt_p$opt_r$opt_u$opt_N" ];then usage "Must specify at least one of -a, -g, -l, -p, -r, -u or -N"; fi @@ -871,7 +870,7 @@ fi if [ -n "$opt_g" ]; then verbose "Write $PKGCHK_CONF based on installed packages" generate_conf_from_installed $PKGCHK_CONF - exit + cleanup_and_exit fi determine_tags @@ -883,7 +882,7 @@ fi if [ -n "$opt_p" ] ; then pkgdirs_from_conf $PKGCHK_CONF $PKGDIRLIST | tr ' ' '\n' - exit + cleanup_and_exit fi if [ -n "$opt_a" -o -n "$opt_l" ];then # Append to PKGDIRLIST based on conf |