diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2000-08-25 12:43:28 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2000-08-25 12:43:28 +0000 |
| commit | 7b2960addc26f247aa79fd276064bb3a4f916545 (patch) | |
| tree | a56ca62c3fdefbd0496d87f10c79da88753fbd77 /mk | |
| parent | f90658289944c5766ae9c0f13968f7b8dac71ea3 (diff) | |
| download | pkgsrc-7b2960addc26f247aa79fd276064bb3a4f916545.tar.gz | |
a couple of minor changes to the bulk-check-uptodate target:
- quote arguments to pkg_admin so the shell doesn't try to expand any *'s.
- be sure that all required binary packages exist. The previous version
made sure the required packages were not newer, but missed catching missing
required packages.
Still todo:
When examining required binary packages to see if they have changed, the test
only looks at the modification time of the binary package. It does not verify
that the required binary package is also up to date with respect to its
pkgsrc files.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index f8c5b6bcdf3..4b4e00ba9e3 100644 --- a/mk/bulk/bsd.bulk-pkg.mk +++ b/mk/bulk/bsd.bulk-pkg.mk @@ -1,4 +1,4 @@ -# $Id: bsd.bulk-pkg.mk,v 1.11 2000/08/24 15:48:12 dmcmahill Exp $ +# $Id: bsd.bulk-pkg.mk,v 1.12 2000/08/25 12:43:28 dmcmahill Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org> @@ -85,14 +85,16 @@ bulk-check-uptodate: for dep in $$deps ; do \ ${SHCOMMENT} "check against the binary pkg that pkg_add would pick, too:" ; \ ${SHCOMMENT} "(Only one should be returned here, really...)" ; \ - for pkg in `${PKG_ADMIN} lsbest ${PACKAGES}/All/$$dep` ; do \ - if [ "$$pkg" -nt "${REF}" ]; then \ - ${ECHO_MSG} >&2 ">> Required binary package $$dep (`basename $$pkg`) is newer, rebuilding... " ; \ - uptodate=0 ; \ - else \ - ${ECHO_MSG} >&2 ">> Required binary package $$dep (`basename $$pkg`) is usable. " ; \ - fi ; \ - done ; \ + pkg=`${PKG_ADMIN} lsbest "${PACKAGES}/All/$$dep"` ; \ + if [ -z $$pkg ]; then \ + ${ECHO_MSG} >&2 ">> Required binary package $$dep does not exist, rebuilding... " ; \ + uptodate=0 ; \ + elif [ "$$pkg" -nt "${REF}" ]; then \ + ${ECHO_MSG} >&2 ">> Required binary package $$dep (`basename $$pkg`) is newer, rebuilding... " ; \ + uptodate=0 ; \ + else \ + ${ECHO_MSG} >&2 ">> Required binary package $$dep (`basename $$pkg`) is usable. " ; \ + fi ; \ done ; \ fi ; \ ${ECHO_MSG} $$uptodate |