diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2010-01-18 12:58:13 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2010-01-18 12:58:13 +0000 |
| commit | b0d04eb64e0162350db0b6423097cdda3aabb170 (patch) | |
| tree | 4db1a63d6c21d62ec2c4e00f9e29bfa6f54e107b /regress | |
| parent | 0b76f55f0766eb55aaf647896d7a8067012bfc09 (diff) | |
even in @option always-update, normal dependency comparison should still
occur (and thus we shouldn't downgrade packages if the version changes)
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/usr.sbin/pkg_add/Makefile | 12 | ||||
| -rw-r--r-- | regress/usr.sbin/pkg_add/list7.out | 1 | ||||
| -rw-r--r-- | regress/usr.sbin/pkg_add/list8.out | 1 |
3 files changed, 11 insertions, 3 deletions
diff --git a/regress/usr.sbin/pkg_add/Makefile b/regress/usr.sbin/pkg_add/Makefile index f75cf43081e..9d4af8c7956 100644 --- a/regress/usr.sbin/pkg_add/Makefile +++ b/regress/usr.sbin/pkg_add/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.35 2010/01/14 19:38:37 espie Exp $ +# $OpenBSD: Makefile,v 1.36 2010/01/18 12:58:12 espie Exp $ REGRESS_TARGETS=pkgnames signatures depends-check longnames update-check1 \ collision-check3 collision-check5 partial-update-test conflict-update \ @@ -78,9 +78,9 @@ collision-check5: rep1/d-0.tgz rep1/e-0.tgz update-check1: rep0/g-0.tgz rep1/g-0.tgz rep0/ga-0.tgz rep1/ga-0.tgz \ rep0/gb-0.tgz rep1/gb-0p0.tgz rep0/gc-0.tgz rep1/gc-0.tgz \ rep0/gd-0.tgz rep1/gd-1.tgz rep0/ge-0.tgz rep1/ge-1.tgz \ - rep0/gf-1.tgz rep1/gf-0.tgz + rep0/gf-1.tgz rep1/gf-0.tgz rep0/gg-0.tgz rep1/gg-0.tgz @-rm -rf ${D8} - @ROOT=${D8} PKG_PATH=${.OBJDIR}/rep0 ${PKG_ADD} g ga gb gc gd ge gf + @ROOT=${D8} PKG_PATH=${.OBJDIR}/rep0 ${PKG_ADD} g ga gb gc gd ge gf gg @ROOT=${D8} PKG_PATH=${.OBJDIR}/rep1 ${PKG_ADD} -u @PKG_DBDIR=${D8}/pkgdb pkg_info |diff - ${.CURDIR}/list7.out @ROOT=${D8} PKG_PATH=${.OBJDIR}/rep1 ${PKG_ADD} -u gd ge @@ -283,6 +283,12 @@ rep0/g-0.tgz: plist4 rep1/g-0.tgz: plist4 @PACKAGE_COMMENT=updated ${PKG_CREATE} -f plist4 $@ +rep0/gg-0.tgz: plist4 + @${PKG_CREATE} -P't/g:g-*:g-1' -f plist4 $@ + +rep1/gg-0.tgz: plist4 + @PACKAGE_COMMENT=updated ${PKG_CREATE} -P't/g:g-*:g-0' -f plist4 $@ + rep0/gd-0.tgz rep1/ge-1.tgz: plist5 @${PKG_CREATE} -f plist5 $@ diff --git a/regress/usr.sbin/pkg_add/list7.out b/regress/usr.sbin/pkg_add/list7.out index 99e632ce1f6..9b379ee95ce 100644 --- a/regress/usr.sbin/pkg_add/list7.out +++ b/regress/usr.sbin/pkg_add/list7.out @@ -5,3 +5,4 @@ gc-0 updated gd-0 comment ge-0 comment gf-1 comment +gg-0 comment diff --git a/regress/usr.sbin/pkg_add/list8.out b/regress/usr.sbin/pkg_add/list8.out index 147991fec00..73daa9c7ad4 100644 --- a/regress/usr.sbin/pkg_add/list8.out +++ b/regress/usr.sbin/pkg_add/list8.out @@ -5,3 +5,4 @@ gc-0 updated gd-1 comment ge-1 comment gf-1 comment +gg-0 comment |