diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-01-05 20:55:20 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-01-05 20:55:20 +0000 |
| commit | fd6b89e3d9cb165829a25cd196b5340104a4e440 (patch) | |
| tree | c14cf6f6d8be04fa8cdfe65fc8e68411b399e757 /perl-install/install_any.pm | |
| parent | 49a8229d69ae7b82dff1417857285f5f0a73f43f (diff) | |
| download | drakx-backup-do-not-use-fd6b89e3d9cb165829a25cd196b5340104a4e440.tar drakx-backup-do-not-use-fd6b89e3d9cb165829a25cd196b5340104a4e440.tar.gz drakx-backup-do-not-use-fd6b89e3d9cb165829a25cd196b5340104a4e440.tar.bz2 drakx-backup-do-not-use-fd6b89e3d9cb165829a25cd196b5340104a4e440.tar.xz drakx-backup-do-not-use-fd6b89e3d9cb165829a25cd196b5340104a4e440.zip | |
no_comment
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 36d6b2eca..12e080d57 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -131,6 +131,7 @@ sub setPackages($) { push @{$o->{default_packages}}, "kernel-pcmcia-cs" if $o->{pcmcia}; push @{$o->{default_packages}}, "apmd" if $o->{pcmcia}; push @{$o->{default_packages}}, "raidtools" if $o->{raid} && !is_empty_array_ref($o->{raid}{raid}); + push @{$o->{default_packages}}, "cdrecord" if detect_devices::getIDEBurners(); pkgs::getDeps($o->{packages}); @@ -543,6 +544,7 @@ sub template2userfile($$$$%) { if (-d dirname($outputfile) && ($force || ! -e $outputfile)) { log::l("generating $outputfile from template $inputfile"); template2file($inputfile, $outputfile, %toreplace); + m|/home/(.*)| and commands::chown_($1, $outputfile); } } } @@ -643,7 +645,7 @@ sub kdeicons_postinstall($) { } my @l = map { "$prefix$_/Desktop/Doc.kdelnk" } list_skels(); - if (my ($lang) = all("$prefix/usr/doc/mandrake")) { + if (my ($lang) = eval { all("$prefix/usr/doc/mandrake") }) { substInFile { s|^(URL=.*?)/?$|$1/$lang| } @l; } else { unlink @l; |