summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/pkg_add/OpenBSD/Delete.pm4
-rw-r--r--usr.sbin/pkg_add/pkg_add.16
-rw-r--r--usr.sbin/pkg_add/pkg_delete.16
3 files changed, 10 insertions, 6 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Delete.pm b/usr.sbin/pkg_add/OpenBSD/Delete.pm
index 65394299e29..44ccb36ea8e 100644
--- a/usr.sbin/pkg_add/OpenBSD/Delete.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Delete.pm
@@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
-# $OpenBSD: Delete.pm,v 1.73 2008/03/08 11:41:42 espie Exp $
+# $OpenBSD: Delete.pm,v 1.74 2008/03/08 11:48:01 espie Exp $
#
# Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
#
@@ -509,7 +509,7 @@ sub delete
return;
}
- if ($state->{quick}) {
+ if ($state->{quick} >= 2) {
unless ($state->{extra}) {
$self->mark_dir($state);
$state->print("You should also $action $realname\n");
diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index 7586493e430..f777377a7be 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.70 2008/03/08 11:41:42 espie Exp $
+.\" $OpenBSD: pkg_add.1,v 1.71 2008/03/08 11:48:01 espie Exp $
.\"
.\" Documentation and design originally from FreeBSD. All the code has
.\" been rewritten since. We keep the documentation's notice:
@@ -283,7 +283,9 @@ symbolic links are resolved, and package installation stops at
.Cm @endfake
marker.
.It Fl q
-Replace package quickly; do not bother with checksums before removing files.
+Replace package quickly; do not bother with checksums before removing normal
+files.
+If used twice, it will not bother with checksums either for configuration files.
.It Fl r
Replace existing packages.
.Nm
diff --git a/usr.sbin/pkg_add/pkg_delete.1 b/usr.sbin/pkg_add/pkg_delete.1
index da01ea560eb..23a85275d86 100644
--- a/usr.sbin/pkg_add/pkg_delete.1
+++ b/usr.sbin/pkg_add/pkg_delete.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pkg_delete.1,v 1.26 2008/03/08 11:41:42 espie Exp $
+.\" $OpenBSD: pkg_delete.1,v 1.27 2008/03/08 11:48:01 espie Exp $
.\"
.\" Documentation and design originally from FreeBSD. All the code has
.\" been rewritten since. We keep the documentation's notice:
@@ -91,7 +91,9 @@ may ask questions to the user if faced with difficult decisions.
Don't actually deinstall a package, just report the steps that
would be taken if it were.
.It Fl q
-Delete package quickly, do not bother with checksums before removing files.
+Delete package quickly, do not bother with checksums before removing normal
+files.
+If used twice, it will not bother with checksums either for configuration files.
.It Fl v
Turn on verbose output.
Several