summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2005-09-13 20:57:14 +0000
committerespie <espie@openbsd.org>2005-09-13 20:57:14 +0000
commit82c373f45d3dcfded73c44cad4950a6e9f31fcfc (patch)
treef59f63f6c9a2e8e8c560b3f57f9e4b4ef255d999
parentuse grabPlist, avoid getting anything else. (diff)
downloadwireguard-openbsd-82c373f45d3dcfded73c44cad4950a6e9f31fcfc.tar.xz
wireguard-openbsd-82c373f45d3dcfded73c44cad4950a6e9f31fcfc.zip
use wipe_info() instead of hand-killing directories.
-rw-r--r--usr.sbin/pkg_add/pkg_add7
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add
index 06b18655d14..96bc8accc55 100644
--- a/usr.sbin/pkg_add/pkg_add
+++ b/usr.sbin/pkg_add/pkg_add
@@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
-# $OpenBSD: pkg_add,v 1.200 2005/09/07 09:11:22 jmc Exp $
+# $OpenBSD: pkg_add,v 1.201 2005/09/13 20:57:14 espie Exp $
#
# Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
#
@@ -34,7 +34,6 @@ use OpenBSD::ProgressMeter;
use OpenBSD::Interactive;
use OpenBSD::Add;
use OpenBSD::SharedLibs;
-use File::Path;
my $errors = 0;
@@ -194,7 +193,7 @@ sub pre_add($$)
return $handle;
} else {
$handle->close();
- rmtree($handle->info());
+ $handle->wipe_info();
delete $handle->{plist};
$handle->{finished} = 1;
if ($state->{forced}->{kitchensink}) {
@@ -592,7 +591,7 @@ sub install_package
return () unless $forced{libdepends};
}
really_add($handle, $state);
- rmtree($handle->info());
+ $handle->wipe_info();
delete $handle->{plist};
$state->{installed}->{$handle->{pkgname}} = 1;
return ();