diff options
| author | Angelo Naselli <anaselli@linux.it> | 2015-05-28 14:59:09 +0200 |
|---|---|---|
| committer | Angelo Naselli <anaselli@linux.it> | 2015-05-28 14:59:09 +0200 |
| commit | 182d3ea544bb065ddc6abeeb1e196d04b53f8831 (patch) | |
| tree | 71b598563d85cd630b840ed80a46ef19b4429ea4 /lib/ManaTools/Rpmdragora/pkg.pm | |
| parent | 52d892c7c77a15843b9064d5215dced57b3ebec8 (diff) | |
| download | manatools-182d3ea544bb065ddc6abeeb1e196d04b53f8831.tar manatools-182d3ea544bb065ddc6abeeb1e196d04b53f8831.tar.gz manatools-182d3ea544bb065ddc6abeeb1e196d04b53f8831.tar.bz2 manatools-182d3ea544bb065ddc6abeeb1e196d04b53f8831.tar.xz manatools-182d3ea544bb065ddc6abeeb1e196d04b53f8831.zip | |
removed warning for an undef value used when priority_upgrade is not
defined
Diffstat (limited to 'lib/ManaTools/Rpmdragora/pkg.pm')
| -rw-r--r-- | lib/ManaTools/Rpmdragora/pkg.pm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/ManaTools/Rpmdragora/pkg.pm b/lib/ManaTools/Rpmdragora/pkg.pm index 7ae7f383..83c3e753 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); |