diff options
| author | Francois Pons <fpons@mandriva.com> | 2002-03-01 13:34:36 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2002-03-01 13:34:36 +0000 |
| commit | 736b61b07c53f94f7be57c51d642a4588eaa981f (patch) | |
| tree | b06db063de853cdb4766c00c9900642e97f9056a | |
| parent | 71320b6848d203cdd8e5ef4210353c6a4045e121 (diff) | |
| download | drakx-backup-do-not-use-736b61b07c53f94f7be57c51d642a4588eaa981f.tar drakx-backup-do-not-use-736b61b07c53f94f7be57c51d642a4588eaa981f.tar.gz drakx-backup-do-not-use-736b61b07c53f94f7be57c51d642a4588eaa981f.tar.bz2 drakx-backup-do-not-use-736b61b07c53f94f7be57c51d642a4588eaa981f.tar.xz drakx-backup-do-not-use-736b61b07c53f94f7be57c51d642a4588eaa981f.zip | |
fixed bad copied package (if one is not found).
| -rw-r--r-- | perl-install/install_any.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 62198a707..7a6a3906f 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -41,7 +41,8 @@ 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 $::o->{method} eq 'cdrom' and setup_postinstall_rpms($::o->{prefix}, $::o->{packages}); + $_[0] > 1 and setup_postinstall_rpms($::o->{prefix}, $::o->{packages}); $asked_medium eq $_[0] or log::l("selecting new medium '$_[0]'"); $asked_medium = $_[0]; @@ -171,7 +172,8 @@ 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. - eval { cp_af((map { "/tmp/image/" . relGetFile(pkgs::packageFile($_)) } @toCopy), $postinstall_rpms) }; + #- cp_af doesn't handle correctly a missing file. + eval { cp_af((grep { -r $_ } map { "/tmp/image/" . relGetFile(pkgs::packageFile($_)) } @toCopy), $postinstall_rpms) }; log::l("copying Auto Install Floppy"); getAndSaveInstallFloppy($::o, "$postinstall_rpms/auto_install.img"); |