diff options
| author |   espie <espie@openbsd.org> | 2014-02-03 13:47:20 +0000 |
|---|---|---|
| committer | espie <espie@openbsd.org> | 2014-02-03 13:47:20 +0000 |
| commit | 101e1cdb97d999f1fb4aab2d26b5bc52379bcb28 (patch) | |
| tree | 920bf5f374c2d8d7ca72bbd8b742d6780aae2fb6 | |
| parent | zap duplicate test, spotted by Arto Jonsson (diff) | |
| download | wireguard-openbsd-101e1cdb97d999f1fb4aab2d26b5bc52379bcb28.tar.xz wireguard-openbsd-101e1cdb97d999f1fb4aab2d26b5bc52379bcb28.zip | |
remove extra cache copy in memory...
to be revisited, the setting of info dir so late is slightly broken and
will reopen packages more times than needed.
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/Handle.pm | 3 | ||||
| -rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PkgAdd.pm | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Handle.pm b/usr.sbin/pkg_add/OpenBSD/Handle.pm index 5753879f351..0fe22de0c91 100644 --- a/usr.sbin/pkg_add/OpenBSD/Handle.pm +++ b/usr.sbin/pkg_add/OpenBSD/Handle.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Handle.pm,v 1.35 2014/02/03 13:28:43 espie Exp $ +# $OpenBSD: Handle.pm,v 1.36 2014/02/03 13:47:20 espie Exp $ # # Copyright (c) 2007-2009 Marc Espie <espie@openbsd.org> # @@ -166,6 +166,7 @@ sub complete_old $self->set_error(BAD_PACKAGE); } else { $self->{plist} = $plist; + delete $location->{contents}; } } } diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm index 6458a7e1154..31b381f2f73 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm @@ -1,7 +1,7 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgAdd.pm,v 1.56 2014/02/03 11:35:44 espie Exp $ +# $OpenBSD: PkgAdd.pm,v 1.57 2014/02/03 13:47:20 espie Exp $ # # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org> # @@ -961,6 +961,7 @@ sub process_set if ($set->newer > 0 || $set->older_to_do > 0) { for my $h ($set->newer) { $h->plist->set_infodir($h->location->info); + delete $h->location->{contents}; } if (!$set->validate_plists($state)) { |