summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-02-13 17:51:55 +0000
committerFrancois Pons <fpons@mandriva.com>2002-02-13 17:51:55 +0000
commit7b7eef52f971ad5c96633825bff4c85d49814b48 (patch)
tree13c4d02341a3085d390df998342c1569dd8fed22 /perl-install
parentc4301d1c1317db55049a76cc1bb6a8a139384cb0 (diff)
downloaddrakx-7b7eef52f971ad5c96633825bff4c85d49814b48.tar
drakx-7b7eef52f971ad5c96633825bff4c85d49814b48.tar.gz
drakx-7b7eef52f971ad5c96633825bff4c85d49814b48.tar.bz2
drakx-7b7eef52f971ad5c96633825bff4c85d49814b48.tar.xz
drakx-7b7eef52f971ad5c96633825bff4c85d49814b48.zip
avoid generating headers for copying file in postinstall-rpm directory.
make sure not to crash if a package that should have been in CD1 is somewhere else.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_any.pm6
1 files changed, 2 insertions, 4 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 7fafa1819..9c81bb796 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -41,8 +41,7 @@ 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.
- #$_[0] > 1 and $::o->{method} eq 'cdrom' and setup_postinstall_rpms($::o->{prefix}, $::o->{packages});
- $_[0] > 1 and setup_postinstall_rpms($::o->{prefix}, $::o->{packages});
+ $_[0] > 1 and $::o->{method} eq 'cdrom' and setup_postinstall_rpms($::o->{prefix}, $::o->{packages});
$asked_medium eq $_[0] or log::l("selecting new medium '$_[0]'");
$asked_medium = $_[0];
@@ -169,8 +168,7 @@ sub setup_postinstall_rpms($$) {
#- the complete filename of each package.
#- copy the package files in the postinstall RPMS directory.
#- last arg is default medium '' known as the CD#1.
- pkgs::extractHeaders($prefix, \@toCopy, $packages->{mediums});
- cp_af((map { "/tmp/image/" . relGetFile(pkgs::packageFile($_)) } @toCopy), $postinstall_rpms);
+ eval { cp_af((map { "/tmp/image/" . relGetFile(pkgs::packageFile($_)) } @toCopy), $postinstall_rpms) };
log::l("copying Auto Install Floppy");
getAndSaveInstallFloppy($::o, "$postinstall_rpms/auto_install.img");