diff options
Diffstat (limited to 'perl-install/pkgs.pm')
-rw-r--r-- | perl-install/pkgs.pm | 4 |
1 files changed, 2 insertions, 2 deletions
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") } |