diff options
author | Marc Espie <espie@cvs.openbsd.org> | 2010-05-10 09:17:56 +0000 |
---|---|---|
committer | Marc Espie <espie@cvs.openbsd.org> | 2010-05-10 09:17:56 +0000 |
commit | 598410cb33a5dae4a9cc9ace47b13645dd15de75 (patch) | |
tree | fb510b8378c93a84533c15a500e8cc37c66a2fff /usr.sbin/pkg_add/OpenBSD/UpdateSet.pm | |
parent | 0c6b6c722d524ad6a478fc0d2efc5076a4aca479 (diff) |
whitespace fixes
Diffstat (limited to 'usr.sbin/pkg_add/OpenBSD/UpdateSet.pm')
-rw-r--r-- | usr.sbin/pkg_add/OpenBSD/UpdateSet.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm b/usr.sbin/pkg_add/OpenBSD/UpdateSet.pm index 8347fabad2a..e17fd345cfd 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.54 2010/04/05 16:07:10 espie Exp $ +# $OpenBSD: UpdateSet.pm,v 1.55 2010/05/10 09:17:55 espie Exp $ # # Copyright (c) 2007-2010 Marc Espie <espie@openbsd.org> # @@ -65,14 +65,14 @@ package OpenBSD::UpdateSet; sub new { my $class = shift; - return bless {newer => {}, older => {}, kept => {}, hints => [], updates => 0}, + return bless {newer => {}, older => {}, kept => {}, hints => [], updates => 0}, $class; } sub path { my $set = shift; - + return $set->{path}; } @@ -241,8 +241,8 @@ sub hint_names sub older_to_do { my $self = shift; - # XXX in `combined' updates, some dependencies may remove extra - # packages, so we do a double-take on the list of packages we + # XXX in `combined' updates, some dependencies may remove extra + # packages, so we do a double-take on the list of packages we # are actually replacing... for now, until we merge update sets. require OpenBSD::PackageInfo; my @l = (); @@ -307,7 +307,7 @@ sub validate_plists $state->vstat->tally; # okay, let's retry the other way around if we haven't yet if (!defined $state->{delete_first}) { - if ($state->{defines}->{deletefirst} || + if ($state->{defines}->{deletefirst} || $state->confirm("Delete older packages first", 0)) { $state->{delete_first} = 1; $state->vstat->drop_changes; |