summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2006-03-07 11:10:50 +0000
committerMarc Espie <espie@cvs.openbsd.org>2006-03-07 11:10:50 +0000
commit4e2868a18500c7e92bf12232cd47b72ae71eec76 (patch)
tree92d3755745a1806eeddedac5d5bf6d6075697a19 /usr.sbin
parent66e127e98ec5cfaac32b57db90776213165ddd01 (diff)
special case: repository holds several packages (say, old versions), and
you choose the most recent one, which also happens to be the currently installed version -> then explicitly say no update is needed and proceed.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/pkg_add/OpenBSD/Update.pm8
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/Update.pm b/usr.sbin/pkg_add/OpenBSD/Update.pm
index 57d58fb1497..3f43d288f74 100644
--- a/usr.sbin/pkg_add/OpenBSD/Update.pm
+++ b/usr.sbin/pkg_add/OpenBSD/Update.pm
@@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
-# $OpenBSD: Update.pm,v 1.62 2006/03/04 11:31:18 espie Exp $
+# $OpenBSD: Update.pm,v 1.63 2006/03/07 11:10:49 espie Exp $
#
# Copyright (c) 2004 Marc Espie <espie@openbsd.org>
#
@@ -119,7 +119,11 @@ sub find
} else {
my $result = OpenBSD::Interactive::choose1($pkgname, $state->{interactive}, sort @l2);
if (defined $result) {
- push(@$new, $result);
+ if (defined $found && $found eq $result && !$plist->uses_old_libs()) {
+ print "No need to update $pkgname\n";
+ } else {
+ push(@$new, $result);
+ }
} else {
$state->{issues} = 1;
}