branch stable 2008.0

2 files changed, 1 insertions, 15 deletions

diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm
index ac9b9d3b..a1221438 100644
--- a/Rpmdrake/gui.pm
+++ b/Rpmdrake/gui.pm
@@ -39,7 +39,6 @@ use Rpmdrake::icon;
 use Rpmdrake::pkg;
 use Rpmdrake::icon;
 use Gtk2::Gdk::Keysyms;
-use Storable qw(dclone); 
 
 our @EXPORT = qw(ask_browse_tree_given_widgets_for_rpmdrake build_tree callback_choices compute_main_window_size do_action get_info get_summary is_locale_available node_state pkgs_provider reset_search set_node_state switch_pkg_list_mode toggle_all toggle_nodes
             $clear_button %grp_columns %pkg_columns $dont_show_selections @filtered_pkgs $find_entry $force_displaying_group $force_rebuild @initial_selection $pkgs $size_free $size_selected $urpm);
@@ -449,6 +448,7 @@ sub pkgs_provider {
 }
 
 sub closure_removal {
+    local $urpm->{state} = {};
     urpm::select::find_packages_to_remove($urpm, $urpm->{state}, \@_);
 }
 
@@ -520,11 +520,6 @@ sub toggle_nodes {
 
     my @nodes_with_deps;
 
-    # let's be able to:
-    # - display additionnal space used or freed if ACKed
-    # - not accounting these packages if user cancel
-    local $urpm->{state} = {};# dclone($urpm->{rpmdrake_state});
-
     if (member($old_state, qw(to_remove installed))) { # remove pacckages
         if ($new_state) {
             my @remove;
@@ -549,10 +544,6 @@ sub toggle_nodes {
             deps_msg(N("Some packages can't be removed"),
                         N("Because of their dependencies, the following package(s) must be\nunselected now:\n\n"),
                         \@nodes, \@nodes_with_deps) or @nodes_with_deps = ();
-            
-            # enable to further reselect these packages:
-            delete $urpm->{state}{rejected}{$_} foreach @nodes_with_deps;
-
             $pkgs->{$_}{base} && ${$pkgs->{$_}{base}}++ foreach @nodes_with_deps;
         }
     } else {
@@ -628,9 +619,6 @@ sub toggle_nodes {
         }
     }
 
-    # do not account these packages if user cancel:
-    @nodes_with_deps and $urpm->{rpmdrake_state} = $urpm->{state};
-
     foreach (@nodes_with_deps) {
         #- some deps may exist on some packages which aren't listed because
         #- not upgradable (older than what currently installed)
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index a10a381c..dcd90762 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -177,8 +177,6 @@ sub warn_about_media {
 
     # do not update again media after installing/removing some packages:
     $::rpmdrake_options{'no-media-update'} ||= 1;
-    use Data::Dumper; print Dumper \%::rpmdrake_options;
-    use Data::Dumper; print Dumper \@update_medias;
 
 	    if (@update_medias > 0) {
 		if (!$opts->{skip_updating_mu} && !$is_update_media_already_asked) {