branch 2009.1

2 files changed, 28 insertions, 10 deletions

diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm
index 40334a42..84549813 100644
--- a/Rpmdrake/gui.pm
+++ b/Rpmdrake/gui.pm
@@ -374,6 +374,7 @@ 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)
@@ -525,15 +526,7 @@ sub pkgs_provider {
     );
     my %tmp_filter_methods = (
         all => sub { [ keys %$pkgs ] },
-        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};
-            }
-        },
+        all_updates => sub { $h->{updates} },
         backports => sub { $h->{backports} },
         meta_pkgs => sub { $h->{meta_pkgs} },
         gui_pkgs => sub { $h->{gui_pkgs} },
@@ -643,6 +636,8 @@ 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;
@@ -734,6 +729,7 @@ 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) });
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index 3ddca0f8..bc2179ba 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -401,11 +401,15 @@ sub get_updates_list {
     # list updates including skiped ones + their deps in MandrivaUpdate:
     @$requested_list = uniq(@$requested_list, @$requested_strict);
 
+    #use Data::Dumper; die Dumper $urpm->{media};
+
     # do not pre select updates in rpmdrake:
     @$requested_strict = () if !$probe_only_for_updates;
 }
 
 sub get_pkgs {
+    use Benchmark;
+    my $t0 = new Benchmark;
     my ($opts) = @_;
     my $w = $::main_window;
 
@@ -475,9 +479,27 @@ sub get_pkgs {
     my $state = {};
     my (@requested, @requested_strict);
 
+    warn ">> $compute_updates || $::MODE eq 'update'\n";
     if ($compute_updates || $::MODE eq 'update') {
+        # faster, ony look at update media for computing updates:
+        use Data::Dumper; output('/tmp/media.pm', Dumper [ \@update_medias, $urpm->{media} ]);
+        my $urpm = $urpm;
+        #my have side effects :-( :
+        $urpm = open_urpmi_db(update => 1) if !is_it_a_devel_distro();
+        #local $urpm->{media} = \@update_medias; # not enough, request_packages_to_upgrade->() will find them anyway due to all packages being known
+
         get_updates_list($urpm, $db, $state, $requested, \@requested, \@requested_strict, \%all_pkgs);
     }
+    my $t1 = new Benchmark;
+    my $td = timediff($t1, $t0);
+    print "the code took:",timestr($td),"\n";
+    use Data::Dumper;
+    $Data::Dumper::Sortkeys = 1;
+    warn ">> $compute_updates || $::MODE eq 'update'\n";
+    output("/tmp/pkgs_$$.pm", Dumper([ \@requested, \@requested_strict ]));
+    #DIE "DONE\n";
+    $a;
+    #exit 1;
 
     $priority_state = $need_restart ? $state : undef;
     $priority_requested = $need_restart ? $requested : undef;
@@ -512,6 +534,7 @@ sub get_pkgs {
       }
     }
     @updates = @requested;
+    #warn Dumper [ \@updates, \@requested, \@requested_strict ];
     # selecting updates by default but skipped ones (MandrivaUpdate only):
     foreach (@requested_strict) {
 	$all_pkgs{$_}{selected} = 1;
@@ -861,7 +884,6 @@ you may now inspect some in order to take actions:"),
     }
 
     N("RPM transaction %d/%d");
-    N("Unselect all");
     N("Details");
 
     statusbar_msg_remove($statusbar_msg_id); #- XXX maybe remove this