aboutsummaryrefslogtreecommitdiffstats
path: root/Rpmdrake
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-03-16 09:10:25 +0000
committerThierry Vignaud <tv@mageia.org>2013-03-16 09:10:25 +0000
commitbe011ee5b35311d6b17afb19467c18911ac5279c (patch)
treed68e9c1d5110e0e152ebdd4b8f8ecb41abea0198 /Rpmdrake
parent9698f44e4e6bc11cb003a6916645ecf3a4a018b1 (diff)
downloadrpmdrake-be011ee5b35311d6b17afb19467c18911ac5279c.tar
rpmdrake-be011ee5b35311d6b17afb19467c18911ac5279c.tar.gz
rpmdrake-be011ee5b35311d6b17afb19467c18911ac5279c.tar.bz2
rpmdrake-be011ee5b35311d6b17afb19467c18911ac5279c.tar.xz
rpmdrake-be011ee5b35311d6b17afb19467c18911ac5279c.zip
perl_checker cleanups
Diffstat (limited to 'Rpmdrake')
-rw-r--r--Rpmdrake/pkg.pm10
1 files changed, 3 insertions, 7 deletions
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index fca2483d..7442f43c 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -367,7 +367,7 @@ sub get_installed_packages {
urpm::select::add_packages_to_priority_upgrade_list('rpmdrake', 'perl-Glib', 'perl-Gtk2');
-my ($priority_state, $priority_requested);
+my $priority_state;
our $need_restart;
our $probe_only_for_updates;
@@ -382,6 +382,7 @@ sub get_updates_list {
%limit_preselect
);
+ require Rpmdrake::gui;
my %common_opts = (
callback_choices => \&Rpmdrake::gui::callback_choices,
priority_upgrade => $urpm->{options}{'priority-upgrade'},
@@ -507,12 +508,7 @@ sub get_pkgs {
get_updates_list($urpm, $db, $state, $requested, \@requested, \@requested_strict, \%all_pkgs, %filter);
}
- if ($need_restart) {
- $priority_state = $state;
- $priority_requested = $requested;
- } else {
- ($priority_state, $priority_requested) = ();
- }
+ $priority_state = $need_restart ? $state : undef;
if (!$probe_only_for_updates) {
$urpm->compute_installed_flags($db); # TODO/FIXME: not for updates