summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-07-15 12:27:46 +0000
committerFrancois Pons <fpons@mandriva.com>2002-07-15 12:27:46 +0000
commitb3ef41c3525fdd602252995a40c0f862fa0c3704 (patch)
tree5dbeecbbd3e20a7e3231490343527bebcfd2cfa8
parent70b2a91a4609c2d023d88764781570b26be0d881 (diff)
downloaddrakx-b3ef41c3525fdd602252995a40c0f862fa0c3704.tar
drakx-b3ef41c3525fdd602252995a40c0f862fa0c3704.tar.gz
drakx-b3ef41c3525fdd602252995a40c0f862fa0c3704.tar.bz2
drakx-b3ef41c3525fdd602252995a40c0f862fa0c3704.tar.xz
drakx-b3ef41c3525fdd602252995a40c0f862fa0c3704.zip
updated NVIDIA support for new methods.
-rw-r--r--perl-install/install_any.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 30beca8b2..9d09ad9af 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -172,7 +172,7 @@ sub setup_postinstall_rpms($$) {
#- copy the package files in the postinstall RPMS directory.
#- last arg is default medium '' known as the CD#1.
#- cp_af doesn't handle correctly a missing file.
- eval { cp_af((grep { -r $_ } map { "/tmp/image/" . relGetFile(pkgs::packageFile($_)) } @toCopy), $postinstall_rpms) };
+ eval { cp_af((grep { -r $_ } map { "/tmp/image/" . relGetFile($_->filename) } @toCopy), $postinstall_rpms) };
log::l("copying Auto Install Floppy");
getAndSaveInstallFloppy($::o, "$postinstall_rpms/auto_install.img");
@@ -196,7 +196,7 @@ sub allowNVIDIA_rpms {
my ($ext, $version, $release) = /kernel[^-]*(-smp|-enterprise|-secure)?(?:-(\d.*?)\.(\d+mdk))?$/ or next;
my $p = pkgs::packageByName($packages, $_);
pkgs::packageSelectedOrInstalled($p) or next;
- $version or ($version, $release) = (pkgs::packageVersion($p), pkgs::packageRelease($p));
+ $version or ($version, $release) = ($p->version, $p->release);
my $name = "NVIDIA_kernel-$version-$release$ext";
pkgs::packageByName($packages, $name) or return;
push @rpms, $name;