diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-08-31 18:28:00 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-08-31 18:28:00 +0000 |
| commit | 4fb58f50234c507d82cea15e3708e1b4d1584503 (patch) | |
| tree | ed48615b9dc74fe1ed6504b701376d93847e1de7 /perl-install/install_any.pm | |
| parent | e49ef06e94b9c3846ab6c4bd50afcb5d77597720 (diff) | |
| download | drakx-backup-do-not-use-4fb58f50234c507d82cea15e3708e1b4d1584503.tar drakx-backup-do-not-use-4fb58f50234c507d82cea15e3708e1b4d1584503.tar.gz drakx-backup-do-not-use-4fb58f50234c507d82cea15e3708e1b4d1584503.tar.bz2 drakx-backup-do-not-use-4fb58f50234c507d82cea15e3708e1b4d1584503.tar.xz drakx-backup-do-not-use-4fb58f50234c507d82cea15e3708e1b4d1584503.zip | |
no_comment
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 38434cb91..7fccfb7a2 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -296,7 +296,7 @@ sub setPackages($) { ($o->{compssUsers}, $o->{compssUsersSorted}) = pkgs::readCompssUsers($o->{packages}, $o->{compss}); my @l = (); - push @l, "kapm", "kcmlaptop" if $o->{pcmcia}; + push @l, "kapm", "kcmlaptop", "DrakProfile", "DrakSync" if $o->{pcmcia}; push @l, "Device3Dfx", "XFree86-glide-module" if detect_devices::matching_desc('Voodoo'); push @l, "Glide_V5" if detect_devices::matching_desc('Voodoo 5'); push @l, "Glide_V3-DRI" if detect_devices::matching_desc('Voodoo 3'); @@ -668,9 +668,9 @@ sub getHds { $o->{hds} = catch_cdie { fsedit::hds(\@drives, $flags) } sub { $ok = 0; - log::l("error reading partition table: $@"); - my ($err) = $@ =~ /(.*) at /; - $flags->{readonly} && $f_err and $f_err->($err); + my $err = $@; $err =~ s/ at (.*?)$//; + log::l("error reading partition table: $err"); + !$flags->{readonly} && $f_err and $f_err->($err); }; if (is_empty_array_ref($o->{hds}) && $o->{autoSCSI}) { |