diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2007-09-08 09:07:53 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2007-09-08 09:07:53 +0000 |
commit | e78fb45b5092a41bd800e7dadcc7c268967c0f4d (patch) | |
tree | 199ccf8baa2a707f39f43df177c6dffabd8571a8 /URPM | |
parent | 1644821da8787d86992609689afdebb63f0c0646 (diff) | |
download | perl-URPM-e78fb45b5092a41bd800e7dadcc7c268967c0f4d.tar perl-URPM-e78fb45b5092a41bd800e7dadcc7c268967c0f4d.tar.gz perl-URPM-e78fb45b5092a41bd800e7dadcc7c268967c0f4d.tar.bz2 perl-URPM-e78fb45b5092a41bd800e7dadcc7c268967c0f4d.tar.xz perl-URPM-e78fb45b5092a41bd800e7dadcc7c268967c0f4d.zip |
rename local var
Diffstat (limited to 'URPM')
-rw-r--r-- | URPM/Resolve.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index e697a49..10ae90d 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -47,10 +47,10 @@ sub property2name_op_version { #- Find candidates packages from a require string (or id). #- Takes care of direct choices using the '|' separator. sub find_candidate_packages { - my ($urpm, $dep, %options) = @_; + my ($urpm, $id_prop, %options) = @_; my %packages; - foreach (split /\|/, $dep) { + foreach (split /\|/, $id_prop) { if (/^\d+$/) { my $pkg = $urpm->{depslist}[$_]; $pkg->flag_skip and next; @@ -81,13 +81,13 @@ sub get_installed_arch { } sub find_chosen_packages { - my ($urpm, $db, $state, $dep) = @_; + my ($urpm, $db, $state, $id_prop) = @_; my %packages; my %installed_arch; my $strict_arch = defined $urpm->{options}{'strict-arch'} ? $urpm->{options}{'strict-arch'} : $Config{archname} =~ /x86_64|sparc64|ppc64/; #- search for possible packages, try to be as fast as possible, backtrack can be longer. - foreach (split /\|/, $dep) { + foreach (split /\|/, $id_prop) { if (/^\d+$/) { my $pkg = $urpm->{depslist}[$_]; $pkg->arch eq 'src' || $pkg->is_arch_compat or next; |