From 3ecc82ac3c2e1254508f59c53414a3012c13d1e4 Mon Sep 17 00:00:00 2001 From: Florent Villard Date: Wed, 1 Dec 2004 06:56:41 +0000 Subject: use the compssUsers related to the meta_class if it exists --- perl-install/install_any.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index e08732eef..3e88c58ed 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -336,6 +336,7 @@ sub selectSupplMedia { #- copy latest compssUsers and rpmsrate somewhere locally getAndSaveFile("/mnt/cdrom/Mandrake/base/compssUsers", "/tmp/compssUsers"); + getAndSaveFile("/mnt/cdrom/Mandrake/base/compssUsers.$o->{meta_class}", "/tmp/compssUsers.$o->{meta_class}"); getAndSaveFile("/mnt/cdrom/Mandrake/base/rpmsrate", "/tmp/rpmsrate"); #- umount supplementary CD. Will re-ask for it later @@ -371,7 +372,7 @@ sub load_rate_files { ); ($o->{compssUsers}, $o->{compssUsersSorted}) = pkgs::readCompssUsers( $o->{meta_class}, - -e '/tmp/compssUsers' ? '/tmp/compssUsers' : 'Mandrake/base/compssUsers' + -e '/tmp/compssUsers' || -e "/tmp/compssUsers.$o->{meta_class}" ? '/tmp/compssUsers' : 'Mandrake/base/compssUsers' ); } -- cgit v1.2.1