3.3-4mdk

3 files changed, 44 insertions, 39 deletions

diff --git a/urpm.pm b/urpm.pm
index 8d77a06b..de252170 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1484,7 +1484,7 @@ sub filter_packages_to_upgrade {
     my ($urpm, $packages, $select_choices, %options) = @_;
     my ($id, %installed, %selected, %conflicts);
     my ($db, @packages) = (rpmtools::db_open(''), keys %$packages);
-    my $sig_handler = sub { rpmtools::db_close($db) };
+    my $sig_handler = sub { rpmtools::db_close($db); exit 3 };
     local $SIG{INT} = $sig_handler;
     local $SIG{QUIT} = $sig_handler;
 
@@ -1603,16 +1603,17 @@ sub filter_packages_to_upgrade {
 		#- if the provides is not found, it will be resolved at next step, else
 		#- it will be resolved by searching the rpm database.
 		$provides{$_} ||= undef;
-		my $check_pkg = sub {
-		    $options{keep_alldeps} and return;
-		    $o and $n eq $_[0]{name} || return;
-		    (!$v || eval(rpmtools::version_compare($_[0]{version}, $v) . $o . 0)) &&
-		      (!$r || rpmtools::version_compare($_[0]{version}, $v) != 0 ||
-		       eval(rpmtools::version_compare($_[0]{release}, $r) . $o . 0)) or return;
-		    $provides{$_} = "$_[0]{name}-$_[0]{version}-$_[0]{release}";
-		};
-		rpmtools::db_traverse_tag($db, $n =~ m|^/| ? 'path' : 'whatprovides', [ $n ],
-					  [ qw (name version release) ], $check_pkg);
+		unless ($options{keep_alldeps}) {
+		    my $check_pkg = sub {
+			$o and $n eq $_[0]{name} || return;
+			(!$v || eval(rpmtools::version_compare($_[0]{version}, $v) . $o . 0)) &&
+			  (!$r || rpmtools::version_compare($_[0]{version}, $v) != 0 ||
+			   eval(rpmtools::version_compare($_[0]{release}, $r) . $o . 0)) or return;
+			$provides{$_} = "$_[0]{name}-$_[0]{version}-$_[0]{release}";
+		    };
+		    rpmtools::db_traverse_tag($db, $n =~ m|^/| ? 'path' : 'whatprovides', [ $n ],
+					      [ qw (name version release) ], $check_pkg);
+		}
 	    }
 	}
 
@@ -1622,23 +1623,24 @@ sub filter_packages_to_upgrade {
 	foreach (@{$pkg->{conflicts} || []}) {
 	    if (my ($n, $o, $v, $r) = /^([^\s\[]*)(?:\[\*\])?(?:\s+|\[)?([^\s\]]*)\s*([^\s\-\]]*)-?([^\s\]]*)/) {
 		my $check_pkg = sub {
-		    $o and $n eq $_[0]{name} || return;
-		    (!$v || eval(rpmtools::version_compare($pkg->{version}, $v) . $o . 0)) &&
-		      (!$r || rpmtools::version_compare($pkg->{version}, $v) != 0 ||
-		       eval(rpmtools::version_compare($pkg->{release}, $r) . $o . 0)) or return;
-		    $conflicts{"$_[0]{name}-$_[0]{version}-$_[0]{release}"} = 1;
+		    my ($p) = @_;
+		    $o and $n eq $p->{name} || return;
+		    (!$v || eval(rpmtools::version_compare($p->{version}, $v) . $o . 0)) &&
+		      (!$r || rpmtools::version_compare($p->{version}, $v) != 0 ||
+		       eval(rpmtools::version_compare($p->{release}, $r) . $o . 0)) or return;
+		    $conflicts{"$p->{name}-$p->{version}-$p->{release}.$p->{arch}"} = 1;
 		    $selected{$_[0]{name}} ||= undef;
 		};
 		rpmtools::db_traverse_tag($db, $n =~ m|^/| ? 'path' : 'whatprovides', [ $n ],
-					  [ qw (name version release) ], $check_pkg);
+					  [ qw (name version release arch) ], $check_pkg);
 		foreach my $fullname (keys %{$urpm->{params}{provides}{$n} || {}}) {
-		    my $pkg = $urpm->{params}{info}{$fullname};
-		    $pkg->{arch} eq 'src' and next;
-		    $o and $n eq $pkg->{name} || next;
-		    (!$v || eval(rpmtools::version_compare($pkg->{version}, $v) . $o . 0)) &&
-		      (!$r || rpmtools::version_compare($pkg->{version}, $v) != 0 ||
-		       eval(rpmtools::version_compare($pkg->{release}, $r) . $o . 0)) or next;
-		    $conflicts{"$pkg->{name}-$pkg->{version}-$pkg->{release}"} ||= 0;
+		    my $p = $urpm->{params}{info}{$fullname};
+		    $p->{arch} eq 'src' and next;
+		    $o and $n eq $p->{name} || next;
+		    (!$v || eval(rpmtools::version_compare($p->{version}, $v) . $o . 0)) &&
+		      (!$r || rpmtools::version_compare($p->{version}, $v) != 0 ||
+		       eval(rpmtools::version_compare($p->{release}, $r) . $o . 0)) or next;
+		    $conflicts{"$p->{name}-$p->{version}-$p->{release}.$p->{arch}"} ||= 0;
 		}
 	    }
 	}
@@ -1704,7 +1706,6 @@ sub filter_packages_to_upgrade {
 		push @choices, $pkg;
 
 		$check_installed->($pkg);
-		$selected{$pkg->{name}} = 1;
 		$installed{$pkg->{id}} and delete $packages->{$pkg->{id}};
 		exists $installed{$pkg->{id}} and push @upgradable_choices, $pkg;
 	    }
@@ -1716,15 +1717,14 @@ sub filter_packages_to_upgrade {
 		}
 	    }
 	    @upgradable_choices > 0 and @choices = @upgradable_choices;
-	    @choices_id{map { $_->{id} } @choices} = ();
-	    if (keys(%choices_id) > 0) {
-		if (keys(%choices_id) == 1) {
-		    my ($id) = keys(%choices_id);
-		    exists $packages->{$id} or $packages->{$id} = 1;
-		    unshift @packages, $id;
-		} else {
-		    push @packages, [ sort { $a <=> $b } keys %choices_id ];
-		}
+	    $choices_id{$_->{id}} = $_ foreach @choices;
+	    if (keys(%choices_id) == 1) {
+		my ($id) = keys(%choices_id);
+		$selected{$choices_id{$id}{name}} = 1;
+		exists $packages->{$id} or $packages->{$id} = 1;
+		unshift @packages, $id;
+	    } elsif (keys(%choices_id) > 1) {
+		push @packages, [ sort { $a <=> $b } keys %choices_id ];
 	    }
 	}
     }
@@ -1996,7 +1996,7 @@ sub extract_packages_to_install {
 sub select_packages_to_upgrade {
     my ($urpm, $prefix, $packages, $remove_packages, $keep_files, %options) = @_;
     my $db = rpmtools::db_open($prefix);
-    my $sig_handler = sub { rpmtools::db_close($db) };
+    my $sig_handler = sub { rpmtools::db_close($db); exit 3 };
     local $SIG{INT} = $sig_handler;
     local $SIG{QUIT} = $sig_handler;
 
diff --git a/urpmi.spec b/urpmi.spec
index b64d750b..bf0e83c9 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
 
 Name: urpmi
 Version: 3.3
-Release: 3mdk
+Release: 4mdk
 License: GPL
 Source0: %{name}.tar.bz2
 Source1: %{name}.logrotate
@@ -144,6 +144,11 @@ fi
 
 
 %changelog
+* Tue Feb 12 2002 François Pons <fpons@mandrakesoft.com> 3.3-4mdk
+- fixed bad method reference in urpmq (used by rpmdrake).
+- fixed urpmq -d behaviour.
+- fixed bad signal handler behaviour.
+
 * Tue Feb 12 2002 François Pons <fpons@mandrakesoft.com> 3.3-3mdk
 - package installed (and not upgraded) are by default using --nodeps
   (typically kernel-source).
diff --git a/urpmq b/urpmq
index d8bc5516..0c796f4b 100755
--- a/urpmq
+++ b/urpmq
@@ -188,9 +188,9 @@ if ($query->{headers} || $query->{sources}) {
 		$packer->extract_archive(undef, @headers);
 	    } else {
 		#- fallback to retrieve rpm package before, so that --headers will be ok.
-		my %uploads = $urpm->upload_source_packages({}, $list, 'local', undef);
-		print STDERR join " ", "rpm2header", values %uploads;
-		system "rpm2header", values %uploads;
+		my %downloads = $urpm->download_source_packages({}, $list, 'local', undef);
+		print STDERR join " ", "rpm2header", values %downloads;
+		system "rpm2header", values %downloads;
 	    }
 	}
     } else {