From 182d3ea544bb065ddc6abeeb1e196d04b53f8831 Mon Sep 17 00:00:00 2001 From: Angelo Naselli Date: Thu, 28 May 2015 14:59:09 +0200 Subject: removed warning for an undef value used when priority_upgrade is not defined --- lib/ManaTools/Rpmdragora/pkg.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/ManaTools/Rpmdragora/pkg.pm b/lib/ManaTools/Rpmdragora/pkg.pm index 7ae7f38..83c3e75 100644 --- a/lib/ManaTools/Rpmdragora/pkg.pm +++ b/lib/ManaTools/Rpmdragora/pkg.pm @@ -408,7 +408,7 @@ sub get_updates_list { my %common_opts = ( callback_choices => \&ManaTools::Rpmdragora::gui::callback_choices, - priority_upgrade => $urpm->{options}{'priority-upgrade'}, + priority_upgrade => $urpm->{options}{'priority-upgrade'} || '', ); if ($urpm->{options}{'priority-upgrade'}) { @@ -767,10 +767,14 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( $saved_flags{$_->id} = $_->flag_requested; $_->id => undef; } grep { $_->flag_selected } @{$urpm->{depslist}} }; + + # NOTE: original code did not manage priority_upgrade anyway + # _priority_upgrade_pkgs needs a string and split gives a warning for an undef value. urpm::select::resolve_dependencies( $urpm, $state, $requested, rpmdb => $::env && "$::env/rpmdb.cz", callback_choices => \&ManaTools::Rpmdragora::gui::callback_choices, + priority_upgrade => '', ); statusbar_msg_remove($bar_id); -- cgit v1.2.1