aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngelo Naselli <anaselli@linux.it>2015-05-28 12:59:09 (GMT)
committerAngelo Naselli <anaselli@linux.it>2015-05-28 12:59:09 (GMT)
commit182d3ea544bb065ddc6abeeb1e196d04b53f8831 (patch)
tree71b598563d85cd630b840ed80a46ef19b4429ea4
parent52d892c7c77a15843b9064d5215dced57b3ebec8 (diff)
removed warning for an undef value used when priority_upgrade is not
defined
-rw-r--r--lib/ManaTools/Rpmdragora/pkg.pm6
1 files changed, 5 insertions, 1 deletions
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);