summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_add/pkg_delete
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2007-05-31 13:33:18 +0000
committerMarc Espie <espie@cvs.openbsd.org>2007-05-31 13:33:18 +0000
commited961759e86d7846ebfd8ee299b97c8d9572c102 (patch)
treeead6e4d8147438ba61a07f746793e50b86394182 /usr.sbin/pkg_add/pkg_delete
parenta6ffe0c491a0cf8157f266b5d4f31191179117b9 (diff)
move set validation earlier (in fact, it probably doesn't belong in
really_add). move common delete_installed() code inside Delete.pm
Diffstat (limited to 'usr.sbin/pkg_add/pkg_delete')
-rw-r--r--usr.sbin/pkg_add/pkg_delete3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/pkg_delete b/usr.sbin/pkg_add/pkg_delete
index 99631c6d2fa..3da5a1f66a8 100644
--- a/usr.sbin/pkg_add/pkg_delete
+++ b/usr.sbin/pkg_add/pkg_delete
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# ex:ts=8 sw=4:
-# $OpenBSD: pkg_delete,v 1.104 2007/05/30 15:10:07 espie Exp $
+# $OpenBSD: pkg_delete,v 1.105 2007/05/31 13:33:17 espie Exp $
#
# Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
#
@@ -199,7 +199,6 @@ eval {
}
$state->set_pkgname($pkgname);
OpenBSD::Delete::delete_package($pkgname, $state);
- delete_installed($pkgname);
$done{$pkgname} = 1;
$removed++;
}