diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2009-10-27 11:45:23 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2009-10-27 11:45:23 +0000 |
| commit | 407c12a2f94870fb298ea8e6066cc6ee9ba483bf (patch) | |
| tree | 2d44b4b4803d8b14e10bcca87e153a418ed5ec2c | |
| parent | 7ca53e93605990a3927e4e11f45056b555b9f6f3 (diff) | |
finish zapping old "kitchensink" option, we have much better ways to test
big stuff now.
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Add.pm | 11 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/pkg_add.1 | 7 |
2 files changed, 3 insertions, 15 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Add.pm b/usr.sbin/pkg_add/OpenBSD/Add.pm index a2e06f3ecfd..bf9b3b27834 100644 --- a/usr.sbin/pkg_add/OpenBSD/Add.pm +++ b/usr.sbin/pkg_add/OpenBSD/Add.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Add.pm,v 1.89 2009/10/11 18:38:06 espie Exp $ +# $OpenBSD: Add.pm,v 1.90 2009/10/27 11:45:22 espie Exp $ # # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org> # @@ -370,9 +370,6 @@ sub prepare_for_addition if ($s->{ro}) { $s->report_ro($state, $fname); } - if ($state->{defines}->{kitchensink} && $state->{not}) { - return; - } if ($s->avail < 0) { $s->report_overflow($state, $fname); } @@ -492,9 +489,6 @@ sub prepare_for_addition if ($s->{ro}) { $s->report_ro($state, $fname); } - if ($state->{defines}->{kitchensink} && $state->{not}) { - return; - } if ($s->avail < 0) { $s->report_overflow($state, $fname); } @@ -683,9 +677,6 @@ sub prepare_for_addition if ($s->{noexec} && $self->exec_on_delete) { $s->report_noexec($state, $fname); } - if ($state->{defines}->{kitchensink} && $state->{not}) { - return; - } if ($s->avail < 0) { $s->report_overflow($state, $fname); } diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1 index 34c0447c953..bdc53ce6810 100644 --- a/usr.sbin/pkg_add/pkg_add.1 +++ b/usr.sbin/pkg_add/pkg_add.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pkg_add.1,v 1.81 2009/10/12 05:17:33 jmc Exp $ +.\" $OpenBSD: pkg_add.1,v 1.82 2009/10/27 11:45:22 espie Exp $ .\" .\" Documentation and design originally from FreeBSD. All the code has .\" been rewritten since. We keep the documentation's notice: @@ -15,7 +15,7 @@ .\" Jordan K. Hubbard .\" .\" -.Dd $Mdocdate: October 12 2009 $ +.Dd $Mdocdate: October 27 2009 $ .Dt PKG_ADD 1 .Os .Sh NAME @@ -245,9 +245,6 @@ architecture recorded in package may not match. force installation of package in the presence of conflicts. .It Ar installed in update mode, reinstall an existing package with the same signature. -.It Ar kitchensink -will install everything and the kitchen sink: randomly reorder the list -of packages to install, and proceed after weeding out conflicts. .It Ar libdepends library specifications may not be fulfilled. .It Ar noclosure |