summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-11-17 21:15:16 +0000
committerOlivier Blin <oblin@mandriva.com>2008-11-17 21:15:16 +0000
commit88fef1693a7248ebec4f8380066b0d2fa418d2ef (patch)
treecff4521ee066945d5b00bcb31aefe0588a277eb9 /perl-install
parent662ae3abbbaf7364a987007b6746b8aea50e13a6 (diff)
downloaddrakx-88fef1693a7248ebec4f8380066b0d2fa418d2ef.tar
drakx-88fef1693a7248ebec4f8380066b0d2fa418d2ef.tar.gz
drakx-88fef1693a7248ebec4f8380066b0d2fa418d2ef.tar.bz2
drakx-88fef1693a7248ebec4f8380066b0d2fa418d2ef.tar.xz
drakx-88fef1693a7248ebec4f8380066b0d2fa418d2ef.zip
fix reading compssUsers.pl if rpmsrate is forced (for example with drakx-in-chroot)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/media.pm4
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 9b0e4555b..78939e0a8 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,5 @@
- fix detecting SMP (was broken we relied on install kernel being non-smp) (#44825)
+- fix reading compssUsers.pl if rpmsrate is forced (for example with drakx-in-chroot)
Version 11.69 - 11 October 2008
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index 8a52befee..d96236039 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -666,9 +666,11 @@ sub get_media_cfg {
#- copy latest compssUsers.pl and rpmsrate somewhere locally
if ($force_rpmsrate || ! -e '/tmp/rpmsrate') {
- getAndSaveFile_($phys_medium, "media_info/compssUsers.pl", "/tmp/compssUsers.pl");
getAndSaveFile_($phys_medium, "media_info/rpmsrate", "/tmp/rpmsrate");
}
+ if ($force_rpmsrate || ! -e '/tmp/compssUsers.pl') {
+ getAndSaveFile_($phys_medium, "media_info/compssUsers.pl", "/tmp/compssUsers.pl");
+ }
$suppl_CDs, $o->{copy_rpms_on_disk};