diff options
| author | Florent Villard <warly@mandriva.com> | 2004-12-01 06:56:41 +0000 |
|---|---|---|
| committer | Florent Villard <warly@mandriva.com> | 2004-12-01 06:56:41 +0000 |
| commit | 3ecc82ac3c2e1254508f59c53414a3012c13d1e4 (patch) | |
| tree | 9cc2e3c04b5d92631c5b75123b40ee00f17dff0f | |
| parent | 9f8f14d10cd4b10117e0fdffa77a889866247740 (diff) | |
| download | drakx-backup-do-not-use-3ecc82ac3c2e1254508f59c53414a3012c13d1e4.tar drakx-backup-do-not-use-3ecc82ac3c2e1254508f59c53414a3012c13d1e4.tar.gz drakx-backup-do-not-use-3ecc82ac3c2e1254508f59c53414a3012c13d1e4.tar.bz2 drakx-backup-do-not-use-3ecc82ac3c2e1254508f59c53414a3012c13d1e4.tar.xz drakx-backup-do-not-use-3ecc82ac3c2e1254508f59c53414a3012c13d1e4.zip | |
use the compssUsers related to the meta_class if it exists
| -rw-r--r-- | perl-install/install_any.pm | 3 |
1 files changed, 2 insertions, 1 deletions
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' ); } |