diff options
| author | dillo <dillo@pkgsrc.org> | 2008-05-21 20:52:31 +0000 |
|---|---|---|
| committer | dillo <dillo@pkgsrc.org> | 2008-05-21 20:52:31 +0000 |
| commit | 6ffe423f77ea75a42620bf62d1efb5e9286476bc (patch) | |
| tree | e8fa07cd45361db7f2eea64387dd0cf0effc70c5 /pkgtools | |
| parent | 081369412af604d43d173a4cdb66c73dd1982db5 (diff) | |
| download | pkgsrc-6ffe423f77ea75a42620bf62d1efb5e9286476bc.tar.gz | |
Bump version to 1.93:
- Explicitly clear automatic flag for packages user wants installed
that got pulled in previously.
- Only ignore pkg_summary.gz in local repository if newer files
with name matching *.t[bg]z exist. (Otherwise, pkg_summary.gz
created by pbulk would be ignored because pkg_summary.bz2 is
newer.)
Okayed by abs@.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_chk/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkg_chk/files/pkg_chk.sh | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile index 2330de12152..32d171243f1 100644 --- a/pkgtools/pkg_chk/Makefile +++ b/pkgtools/pkg_chk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.62 2008/05/03 12:57:47 apb Exp $ +# $NetBSD: Makefile,v 1.63 2008/05/21 20:52:31 dillo Exp $ -DISTNAME= pkg_chk-1.92 +DISTNAME= pkg_chk-1.93 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 3ab61e1e879..a27daa12106 100755 --- a/pkgtools/pkg_chk/files/pkg_chk.sh +++ b/pkgtools/pkg_chk/files/pkg_chk.sh @@ -1,10 +1,11 @@ #!@SH@ -e # -# $Id: pkg_chk.sh,v 1.57 2008/05/02 19:10:26 apb Exp $ +# $Id: pkg_chk.sh,v 1.58 2008/05/21 20:52:31 dillo Exp $ # # TODO: Make -g check dependencies and tsort -# TODO: Variation of -g which only lists top level packages -# TODO: List top level packages installed but not in config +# TODO: Make -g list user-installed packages first, followed by commented +# out automatically installed packages +# TODO: List user-installed packages that are not in config PATH=${PATH}:/usr/sbin:/usr/bin @@ -254,7 +255,7 @@ get_bin_pkg_info() { summary_file=$PACKAGES/$SUMMARY_FILE if [ -f $summary_file ] ; then - if [ -z "$(find $PACKAGES -type f -newer $summary_file)" ] ; then + if [ -z "$(find $PACKAGES -type f -newer $summary_file -name '*.t[bg]z')" ] ; then zcat $summary_file return; fi @@ -543,6 +544,7 @@ pkg_install() FAIL= if [ -d $PKG_DBDIR/$PKGNAME ];then msg "$PKGNAME installed in previous stage" + run_cmd_su "${PKG_ADMIN} unset automatic $PKGNAME" elif [ -n "$opt_b" ] && is_binary_available $PKGNAME; then if [ -n "$saved_PKG_PATH" ] ; then export PKG_PATH=$saved_PKG_PATH |