diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-07-08 16:28:18 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-07-08 16:28:18 +0000 |
| commit | 731c48756908997850eb3cb69f732c6f82e1927e (patch) | |
| tree | 2b57d43199b02b2afbb4399bd747f6189903ba02 /urpm | |
| parent | 7c1164998504b587091c70c50c142c119e58f04b (diff) | |
| download | urpmi-731c48756908997850eb3cb69f732c6f82e1927e.tar urpmi-731c48756908997850eb3cb69f732c6f82e1927e.tar.gz urpmi-731c48756908997850eb3cb69f732c6f82e1927e.tar.bz2 urpmi-731c48756908997850eb3cb69f732c6f82e1927e.tar.xz urpmi-731c48756908997850eb3cb69f732c6f82e1927e.zip | |
we don't need to know the medium to compute ->is_delta_installable, so doing
it in previous loop
Diffstat (limited to 'urpm')
| -rw-r--r-- | urpm/get_pkgs.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/urpm/get_pkgs.pm b/urpm/get_pkgs.pm index 2a8e5c9d..ae7844cd 100644 --- a/urpm/get_pkgs.pm +++ b/urpm/get_pkgs.pm @@ -66,7 +66,9 @@ sub selected2list { urpm::select::search_packages($urpm, \%requested, [$pkg->name], src => 1); map { split /\|/ } keys %requested; } : do { - map { $_->id } grep { $fullname eq $_->fullname } $urpm->packages_by_name($pkg->name); + map { $_->id } grep { + $_->filename !~ /\.delta\.rpm$/ || $urpm->is_delta_installable($_, $urpm->{root}); + } grep { $fullname eq $_->fullname } $urpm->packages_by_name($pkg->name); }; # id_map is a remapping of id. @@ -89,9 +91,7 @@ sub selected2list { shift @remaining_ids; my $pkg = $urpm->{depslist}[$id]; - if ($pkg->filename !~ /\.delta\.rpm$/ || $urpm->is_delta_installable($pkg, $urpm->{root})) { - $sources{$id_map{$id}} = "$medium->{url}/" . $pkg->filename; - } + $sources{$id_map{$id}} = "$medium->{url}/" . $pkg->filename; } } \%sources; |