diff options
| -rw-r--r-- | perl-install/install_any.pm | 6 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index aaf820648..a6fb37839 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -39,7 +39,7 @@ my $postinstall_rpms = ''; my $cdrom; my %iso_images; -sub mountCdrom($;$) { +sub mountCdrom { my ($mountpoint, $cdrom_) = @_; $cdrom_ = $cdrom if !defined $cdrom_; eval { fs::mount($cdrom_, $mountpoint, "iso9660", 'readonly') }; @@ -196,7 +196,7 @@ sub getFile { #- this allows handling changing a media when some of the files on the #- first CD have been copied to other to avoid media change... my $f2 = "$postinstall_rpms/$f"; - $altroot = '/tmp/image' unless $altroot; + $altroot ||= '/tmp/image'; $f2 = "$altroot/$rel" if !$postinstall_rpms || !-e $f2; $f2 = $rel if $rel =~ m!^/! && !-e $f2; #- not a relative path my $F; open($F, $f2) && $F; @@ -370,7 +370,7 @@ sub setPackages { (my $cdromdev) = detect_devices::cdroms(); last SUPPL if !$cdromdev; $cdrom = $cdromdev->{device}; - my $dev = devices::make($cdrom); + devices::make($cdrom); ejectCdrom($cdrom); if ($o->ask_okcancel('', N("Insert the CD"), 1)) { mountCdrom("/mnt/cdrom", $cdrom); diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 815ce25bc..af1777aae 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -573,7 +573,7 @@ sub read_rpmsrate { sub readCompssUsers { my ($meta_class, $file) = @_; - $file = 'Mandrake/base/compssUsers' if !$file; + $file ||= 'Mandrake/base/compssUsers'; my $f = $meta_class && install_any::getFile("$file.$meta_class") || install_any::getFile($file) or die "can't find $file"; readCompssUsers_raw($f); } @@ -940,7 +940,7 @@ sub installTransactionClosure { (my $cdromdev) = detect_devices::cdroms(); $cdrom = $cdromdev->{device}; log::l("cdrom redetected at $cdrom"); - my $dev = devices::make($cdrom); + devices::make($cdrom); install_any::ejectCdrom($cdrom) if $::o->{method} eq 'cdrom'; # will umount /tmp/image install_any::mountCdrom("/mnt/cdrom", $cdrom); } else { log::l("cdrom already found at $cdrom") } |