diff options
Diffstat (limited to 'Rpmdrake/gui.pm')
| -rw-r--r-- | Rpmdrake/gui.pm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm index 33052285..e1d0abbc 100644 --- a/Rpmdrake/gui.pm +++ b/Rpmdrake/gui.pm @@ -398,7 +398,6 @@ sub toggle_all { my @l = children($w) or return; my @unsel = grep_unselected(@l); - # FIXME: ignore unsel according to $_val (val=0 => unselect?, =1 => select?) my @p = @unsel ? #- not all is selected, select all if no option to potentially override (exists $common->{partialsel_unsel} && $common->{partialsel_unsel}->(\@unsel, \@l) ? difference2(\@l, \@unsel) : @unsel) @@ -511,10 +510,6 @@ sub ask_browse_tree_given_widgets_for_rpmdrake { $common->{initial_selection} and toggle_nodes($w->{tree}->window, $w->{detail_list_model}, \&set_leaf_state, undef, @{$common->{initial_selection}}); #my $_b = before_leaving { $clear_all_caches->() }; $common->{init_callback}->() if $common->{init_callback}; - use Data::Dumper; - #output('/tmp/pkgs.pm', Dumper([ - # format_pkg_simplifiedinfo($pkgs, 'basesystem', $urpm, $descriptions) - #])); $w->{w}->main; } @@ -554,7 +549,15 @@ sub pkgs_provider { ); my %tmp_filter_methods = ( all => sub { [ keys %$pkgs ] }, - all_updates => sub { $h->{updates} }, + all_updates => sub { + # potential "updates" from media not tagged as updates: + if (!$options{pure_updates} && !$Rpmdrake::pkg::need_restart) { + [ @{$h->{updates}}, + difference2([ grep { is_updatable($_) } @{$h->{installable}} ], $h->{backports}) ]; + } else { + $h->{updates}; + } + }, backports => sub { $h->{backports} }, meta_pkgs => sub { $h->{meta_pkgs} }, gui_pkgs => sub { $h->{gui_pkgs} }, @@ -664,8 +667,6 @@ sub toggle_nodes { \@nodes, \@nodes_with_deps) or @nodes_with_deps = (); }; - warn ">> old_state=$old_state, new_state=$new_state\n"; - if (member($old_state, qw(to_remove installed))) { # remove pacckages if ($new_state) { my @remove; @@ -757,7 +758,6 @@ sub toggle_nodes { packages_selection_ok: } else { my @unrequested; - warn ">> DESELECTING\n"; slow_func($widget, sub { @unrequested = $urpm->disable_selected(open_rpm_db(), $urpm->{state}, map { $pkgs->{$_}{pkg} } @nodes) }); |