summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-10-14 06:45:13 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-10-14 06:45:13 +0000
commitf81059c270cd8fe83e2647da38232baeed85d391 (patch)
tree23cd87bb76472bf63a84a8248b8188a9b00df785
parentdae67713a6a2f5d1b87433e9dd8fb160afac959d (diff)
downloaddrakx-f81059c270cd8fe83e2647da38232baeed85d391.tar
drakx-f81059c270cd8fe83e2647da38232baeed85d391.tar.gz
drakx-f81059c270cd8fe83e2647da38232baeed85d391.tar.bz2
drakx-f81059c270cd8fe83e2647da38232baeed85d391.tar.xz
drakx-f81059c270cd8fe83e2647da38232baeed85d391.zip
cleanup thanks to perl_checker
-rw-r--r--perl-install/network/tools.pm15
1 files changed, 9 insertions, 6 deletions
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index a35896766..964c380f9 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -183,12 +183,15 @@ sub use_windows {
my ($file) = @_;
my $all_hds = fsedit::get_hds({}, undef);
fs::get_info_from_fstab($all_hds);
- my $part = find { $_->{device_windobe} eq 'C' } fs::get::fstab($all_hds);
- $part or my $failed = N("No partition available");
- my $source = find { -d $_ && -r "$_/$file" } map { "$part->{mntpoint}/$_" } qw(windows/system winnt/system windows/system32/drivers winnt/system32/drivers);
- log::explanations($failed || "Seek in $source to find firmware");
-
- return $source, $failed;
+ if (my $part = find { $_->{device_windobe} eq 'C' } fs::get::fstab($all_hds)) {
+ my $source = find { -d $_ && -r "$_/$file" } map { "$part->{mntpoint}/$_" } qw(windows/system winnt/system windows/system32/drivers winnt/system32/drivers);
+ log::explanations("Seek in $source to find firmware");
+ $source;
+ } else {
+ my $failed = N("No partition available");
+ log::explanations($failed);
+ undef, $failed;
+ }
}
sub use_floppy {