summaryrefslogtreecommitdiffstats
path: root/urpm/get_pkgs.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-11-29 15:46:25 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-11-29 15:46:25 +0000
commit50bfacb9170146abf3c11332cf509734d117a91f (patch)
tree6b07521f180be3ca940fdfa77fb2d5273a3cad19 /urpm/get_pkgs.pm
parentdf95f65347ad42a943b273e0bbaaf865826c93cc (diff)
downloadurpmi-50bfacb9170146abf3c11332cf509734d117a91f.tar
urpmi-50bfacb9170146abf3c11332cf509734d117a91f.tar.gz
urpmi-50bfacb9170146abf3c11332cf509734d117a91f.tar.bz2
urpmi-50bfacb9170146abf3c11332cf509734d117a91f.tar.xz
urpmi-50bfacb9170146abf3c11332cf509734d117a91f.zip
directly set $urpm->{root}, it's simpler
(also use it in urpm::get_pkgs::selected2list() even if callers didn't pass it)
Diffstat (limited to 'urpm/get_pkgs.pm')
-rw-r--r--urpm/get_pkgs.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/urpm/get_pkgs.pm b/urpm/get_pkgs.pm
index 29a3ce1f..c1c150a6 100644
--- a/urpm/get_pkgs.pm
+++ b/urpm/get_pkgs.pm
@@ -85,7 +85,7 @@ sub selected2list {
} elsif (keys(%{$file2fullnames{$filename} || {}}) == 1) {
my ($fullname) = keys(%{$file2fullnames{$filename} || {}});
if (defined(my $id = $fullname2id{$fullname})) {
- if (!/\.delta\.rpm$/ || $urpm->is_delta_installable($urpm->{depslist}[$id], $options{root})) {
+ if (!/\.delta\.rpm$/ || $urpm->is_delta_installable($urpm->{depslist}[$id], $urpm->{root})) {
$sources{$id} = "$medium->{url}/$filename";
}
}
@@ -118,7 +118,7 @@ sub selected2list {
unless (exists($list_examined{$fullname})) {
++$list_warning;
if (defined(my $id = $fullname2id{$fullname})) {
- if ($fi !~ /\.delta\.rpm$/ || $urpm->is_delta_installable($urpm->{depslist}[$id], $options{root})) {
+ if ($fi !~ /\.delta\.rpm$/ || $urpm->is_delta_installable($urpm->{depslist}[$id], $urpm->{root})) {
$sources{$id} = "$medium->{url}/" . $fi;
}
}