summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--urpm.pm7
-rwxr-xr-xurpmi2
-rw-r--r--urpmi.spec6
-rwxr-xr-xurpmq2
4 files changed, 11 insertions, 6 deletions
diff --git a/urpm.pm b/urpm.pm
index 4954594f..8e04b59f 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1304,6 +1304,7 @@ sub search_packages {
my (%exact, %exact_a, %exact_ra, %found, %foundi);
foreach my $v (@$names) {
+ print "search $v\n";
#- it is a way of speedup, providing the name of a package directly help
#- to find the package.
#- this is necessary if providing a name list of package to upgrade.
@@ -1320,7 +1321,7 @@ sub search_packages {
if ($options{use_provides}) {
unless ($options{fuzzy}) {
#- try to search through provides.
- if (my @l = grep { defined $_ } map { $_ && ($options{src} ? $_->arch eq 'src' : $_->arch ne 'src') &&
+ if (my @l = grep { defined $_ } map { $_ && ($options{src} ? $_->arch eq 'src' : $_->is_arch_compat) &&
$_->id || undef } map { $urpm->{depslist}[$_] }
keys %{$urpm->{provides}{$v} || {}}) {
#- we assume that if the there is at least one package providing the resource exactly,
@@ -1703,8 +1704,8 @@ sub deselect_unwanted_packages {
foreach (keys %{$urpm->{provides}{$_} || {}}) {
my $pkg = $urpm->{depslist}[$_] or next;
$pkg->arch eq 'src' and next; #- never ignore source package.
- $options{force} || (exists $packages->{$pkg->id} && defined $packages->{$pkg->id})
- and delete $packages->{$pkg->id};
+ $options{force} || (exists $packages->{$_} && defined $packages->{$_})
+ and delete $packages->{$_};
}
}
close F;
diff --git a/urpmi b/urpmi
index 965dca04..f66cda34 100755
--- a/urpmi
+++ b/urpmi
@@ -198,7 +198,7 @@ $urpm->relocate_depslist_provides();
#- select individual files.
my %packages;
-@packages{($start .. $end)} = ();
+defined $start && defined $end and @packages{($start .. $end)} = ();
#- search the packages according the selection given by the user,
#- basesystem is added to the list so if it need to be upgraded,
diff --git a/urpmi.spec b/urpmi.spec
index 0bc81dec..cd2a8667 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
Name: urpmi
Version: 3.4
-Release: 5mdk
+Release: 6mdk
License: GPL
Source0: %{name}.tar.bz2
Source1: %{name}.logrotate
@@ -144,6 +144,10 @@ fi
%changelog
+* Fri Jun 7 2002 François Pons <fpons@mandrakesoft.com> 3.4-6mdk
+- fixed skip.list to skip according provides (even not the best).
+- fixed package id 0 always selected (generally ldconfig or lsbdev).
+
* Wed Jun 5 2002 François Pons <fpons@mandrakesoft.com> 3.4-5mdk
- fixed fuzzy search on package (error in urpm.pm around line 1404-1409).
diff --git a/urpmq b/urpmq
index 84f351f3..03215e09 100755
--- a/urpmq
+++ b/urpmq
@@ -126,7 +126,7 @@ $urpm->relocate_depslist_provides();
#- select individual files.
my %packages;
-@packages{($start .. $end)} = ();
+defined $start && defined $end and @packages{($start .. $end)} = ();
#- search the packages according the selection given by the user,
#- basesystem is added to the list so if it need to be upgraded, all its dependency