summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2014-02-04 18:06:02 +0000
committerMarc Espie <espie@cvs.openbsd.org>2014-02-04 18:06:02 +0000
commit1c491e2bd458e383c84a136a1da7ff91b7a1ccc0 (patch)
treee47290d1871f050af0c624b8cfaab05418ee49cf /usr.sbin
parent6cca67d28da9d69fed598a3cad299489a048cc5b (diff)
prevent updates from starting with a lone ":"
Some UpdateSets will only contain kept packages, BUT require the update of some dependencies. just spew out the kept_names instead of newer_names in that case.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/pkg_add/OpenBSD/UpdateSet.pm9
1 files changed, 7 insertions, 2 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm b/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm
index d8f1c6ebe5c..fbd058c202a 100644
--- a/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm
+++ b/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm
@@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
-# $OpenBSD: UpdateSet.pm,v 1.74 2014/02/02 15:22:36 espie Exp $
+# $OpenBSD: UpdateSet.pm,v 1.75 2014/02/04 18:06:01 espie Exp $
#
# Copyright (c) 2007-2010 Marc Espie <espie@openbsd.org>
#
@@ -370,7 +370,12 @@ sub print
sub todo_names
{
- &newer_names;
+ my $self = shift;
+ if ($self->newer > 0) {
+ return $self->newer_names;
+ } else {
+ return $self->kept_names;
+ }
}
sub validate_plists