summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-04-21 18:32:51 +0000
committerFrancois Pons <fpons@mandriva.com>2000-04-21 18:32:51 +0000
commit071b523e11c54dbd06ce1f0e1e70a408fed1b1ba (patch)
tree567a9380e1c00ee3b9d1df03297fa2fb80f5e027
parent8ae9897f2abaff7e1586d666cbb6f84c44d9391d (diff)
downloaddrakx-071b523e11c54dbd06ce1f0e1e70a408fed1b1ba.tar
drakx-071b523e11c54dbd06ce1f0e1e70a408fed1b1ba.tar.gz
drakx-071b523e11c54dbd06ce1f0e1e70a408fed1b1ba.tar.bz2
drakx-071b523e11c54dbd06ce1f0e1e70a408fed1b1ba.tar.xz
drakx-071b523e11c54dbd06ce1f0e1e70a408fed1b1ba.zip
*** empty log message ***
-rw-r--r--perl-install/install_any.pm5
-rw-r--r--perl-install/pkgs.pm2
2 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 665cdc391..df92c66b4 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -43,6 +43,7 @@ XFree86 dhcpxd pump ppp ypbind rhs-printfilters samba ncpfs kernel-fb
my $postinstall_rpms = '';
my $current_medium = 1;
my $asked_medium = 1;
+my $cdrom = undef;
sub useMedium($) {
#- before ejecting the first CD, there are some files to copy!
#- does nothing if the function has already been called.
@@ -81,8 +82,8 @@ sub errorOpeningFile($) {
my $max = 32; #- always refuse after $max tries.
if ($::o->{method} eq "cdrom") {
- cat_("/proc/mounts") =~ m|(/tmp/\S+)\s+/tmp/rhimage| or return;
- my $cdrom = $1;
+ cat_("/proc/mounts") =~ m|(/tmp/\S+)\s+/tmp/rhimage| and $cdrom = $1;
+ return unless $cdrom;
ejectCdrom($cdrom);
while ($max > 0 && askChangeMedium($::o->{method}, $asked_medium)) {
$current_medium = $asked_medium;
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 1c2125b1a..7b273e5b7 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -1016,7 +1016,7 @@ sub install($$$;$$) {
log::l("bad package $_->{file}");
packageSetFlagSelected($_, 0);
}
- cdie "error installing package list: " . join("\n", map { $_->{file} } @badpkgs);
+ cdie ("error installing package list: " . join("\n", map { $_->{file} } @badpkgs));
}
} while ($nb > 0 && !$pkgs::cancel_install);