summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2014-05-05 16:29:32 +0000
committerespie <espie@openbsd.org>2014-05-05 16:29:32 +0000
commit6bbdf2101d4fbe760c9574d33d212447f81204c7 (patch)
tree4a0ebf34d9007b43fd24fc59b6f82e45e4673857
parentSort and group includes. (diff)
downloadwireguard-openbsd-6bbdf2101d4fbe760c9574d33d212447f81204c7.tar.xz
wireguard-openbsd-6bbdf2101d4fbe760c9574d33d212447f81204c7.zip
work-around the same location being reinstalled thru a different path
later... no need to do anything on sets consisting purely of "kept" handles This is not fully satisfying, I expect I need to tie some "done already" to locations as we do with sets, so that we can wipe update_info properly and be done once and for all... Issue found by stsp@ while trying to use FETCH_PACKAGES, which is still not 100% in good shape with this.
-rw-r--r--usr.sbin/pkg_add/OpenBSD/PkgAdd.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm b/usr.sbin/pkg_add/OpenBSD/PkgAdd.pm
index 80110d07a0b..45f227e0676 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.64 2014/03/18 18:53:29 espie Exp $
+# $OpenBSD: PkgAdd.pm,v 1.65 2014/05/05 16:29:32 espie Exp $
#
# Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
#
@@ -903,6 +903,9 @@ sub process_set
if (newer_has_errors($set, $state)) {
return ();
}
+ if ($set->newer == 0 && $set->older_to_do == 0) {
+ return ();
+ }
my @deps = $set->solver->solve_depends($state);
if ($state->verbose >= 2) {