summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-01-16 16:14:20 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-01-16 16:14:20 +0000
commitb5aa16a1e615298dc24a78d49ab12b9123839950 (patch)
treefafd9be014a8f8b7babd097158e6df56e0d6c1df
parent5686a03e151f4a202e6d557ecbea6dda805dd1d2 (diff)
downloaddrakx-b5aa16a1e615298dc24a78d49ab12b9123839950.tar
drakx-b5aa16a1e615298dc24a78d49ab12b9123839950.tar.gz
drakx-b5aa16a1e615298dc24a78d49ab12b9123839950.tar.bz2
drakx-b5aa16a1e615298dc24a78d49ab12b9123839950.tar.xz
drakx-b5aa16a1e615298dc24a78d49ab12b9123839950.zip
workaround ref count perl bug
-rw-r--r--perl-install/install_any.pm14
1 files changed, 7 insertions, 7 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 1990e891e..335724414 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -968,13 +968,13 @@ sub suggest_mount_points {
sub find_root_parts {
my ($fstab, $prefix) = @_;
map {
- if (my $handle = any::inspect($_, $prefix)) {
- if (my $s = cat_("$handle->{dir}/etc/mandrake-release")) {
- chomp($s);
- $s =~ s/\s+for\s+\S+//;
- log::l("find_root_parts found $_->{device}: $s");
- { release => $s, part => $_ };
- } else { () }
+ my $handle = any::inspect($_, $prefix);
+ my $s = $handle && cat_("$handle->{dir}/etc/mandrake-release");
+ if ($s) {
+ chomp($s);
+ $s =~ s/\s+for\s+\S+//;
+ log::l("find_root_parts found $_->{device}: $s");
+ { release => $s, part => $_ };
} else { () }
} @$fstab;
}