diff options
| author | Francois Pons <fpons@mandriva.com> | 2002-07-03 12:40:57 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2002-07-03 12:40:57 +0000 |
| commit | 62827bdad31e9dbe895aaa5f44f6d02c50f9c6e4 (patch) | |
| tree | 8582b4d8fb6833d76f35cd58b1d9111f1a8171d7 /URPM | |
| parent | 8c4ba003b8c03a94d70efb40978fe28282389673 (diff) | |
| download | perl-URPM-62827bdad31e9dbe895aaa5f44f6d02c50f9c6e4.tar perl-URPM-62827bdad31e9dbe895aaa5f44f6d02c50f9c6e4.tar.gz perl-URPM-62827bdad31e9dbe895aaa5f44f6d02c50f9c6e4.tar.bz2 perl-URPM-62827bdad31e9dbe895aaa5f44f6d02c50f9c6e4.tar.xz perl-URPM-62827bdad31e9dbe895aaa5f44f6d02c50f9c6e4.zip | |
0.06-1mdk
Diffstat (limited to 'URPM')
| -rw-r--r-- | URPM/Build.pm | 6 | ||||
| -rw-r--r-- | URPM/Resolve.pm | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/URPM/Build.pm b/URPM/Build.pm index 39e8481..9e60c02 100644 --- a/URPM/Build.pm +++ b/URPM/Build.pm @@ -335,9 +335,9 @@ sub build_hdlist { $split = $options{split} || 400000; open B, "| " . ($ENV{LD_LOADER} || '') . " packdrake -b${ratio}ds '$options{hdlist}' '$dir' $split"; - foreach (@{$urpm->{depslist}}[$start .. $end]) { - my $filename = $_->fullname; - "$filename.rpm" ne $_->filename && $_->filename =~ /([^\/]*)\.rpm$/ and $filename .= ":$1"; + foreach my $pkg (@{$urpm->{depslist}}[$start .. $end]) { + my $filename = $pkg->fullname; + "$filename.rpm" ne $pkg->filename && $pkg->filename =~ /([^\/]*)\.rpm$/ and $filename .= ":$1"; -s "$dir/$filename" or die "bad header $dir/$filename\n"; print B "$filename\n"; } diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 820eb3c..afc7864 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -267,8 +267,7 @@ sub resolve_requested { if (my ($name) =~ /^([^\s\[]*)/) { foreach (keys %{$urpm->{provides}{$name} || {}}) { my $p = $urpm->{depslist}[$_]; - ($pkg->flag_requested || $pkg->flag_required) && $pkg->flag_upgrade and - $state->{ask_unselect}{$p->id}{$pkg->id}; + $pkg->flag_selected and $state->{ask_unselect}{$p->id}{$pkg->id}; } } } |