summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-13 14:29:40 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-13 14:29:40 +0000
commit6b9e889257fb9205372aba8da5004a6e912b9eb5 (patch)
tree3ad29f82a981944e3ab950cd62a0ce09afd9dbb2
parent3f08e0199a71bd9d38640d85cf659f2fce9d707e (diff)
downloaddrakx-6b9e889257fb9205372aba8da5004a6e912b9eb5.tar
drakx-6b9e889257fb9205372aba8da5004a6e912b9eb5.tar.gz
drakx-6b9e889257fb9205372aba8da5004a6e912b9eb5.tar.bz2
drakx-6b9e889257fb9205372aba8da5004a6e912b9eb5.tar.xz
drakx-6b9e889257fb9205372aba8da5004a6e912b9eb5.zip
get the arch from release_file
-rw-r--r--perl-install/install/any.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 7af16307b..d99940a93 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -960,9 +960,9 @@ sub find_root_parts {
my $extract = sub {
my ($prefix, $f, $part) = @_;
chomp(my $s = cat_("$prefix$f"));
- $s =~ s/\s+for\s+\S+//;
- log::l("find_root_parts found $part->{device}: $s" . ($f !~ m!/etc/! ? " in special release file $f" : ''));
- { release => $s, release_file => $f, part => $part };
+ my $arch = $s =~ s/\s+for\s+(\S+)// && $1;
+ log::l("find_root_parts found $part->{device}: $s for $arch" . ($f !~ m!/etc/! ? " in special release file $f" : ''));
+ { release => $s, release_file => $f, part => $part, arch => $arch };
};
if ($::local_install) {