diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-11-26 12:38:17 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-11-26 12:38:17 +0000 |
| commit | 6c3678b7655a2e2dbd75b4b51365346042582569 (patch) | |
| tree | 2fbe3f490b45f728a5c3fd5e3a6a71169706e636 | |
| parent | b071e429fa16c02709fa05828999ac30be42b03a (diff) | |
| download | drakx-6c3678b7655a2e2dbd75b4b51365346042582569.tar drakx-6c3678b7655a2e2dbd75b4b51365346042582569.tar.gz drakx-6c3678b7655a2e2dbd75b4b51365346042582569.tar.bz2 drakx-6c3678b7655a2e2dbd75b4b51365346042582569.tar.xz drakx-6c3678b7655a2e2dbd75b4b51365346042582569.zip | |
We won't have files named compssUsers.pl.<meta_class> since they're all
merged now.
| -rw-r--r-- | perl-install/install_any.pm | 1 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index b4ee7c6e2..4c27f3ffd 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -595,7 +595,6 @@ sub load_rate_files { getFile(-e "/tmp/rpmsrate" ? "/tmp/rpmsrate" : "media/media_info/rpmsrate") ); ($o->{compssUsers}, $o->{gtk_display_compssUsers}) = pkgs::readCompssUsers( - $o->{meta_class}, -e '/tmp/compssUsers.pl' ? '/tmp/compssUsers.pl' : 'media/media_info/compssUsers.pl' ); } diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 446a1f479..572e55b10 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -623,9 +623,9 @@ sub read_rpmsrate { } sub readCompssUsers { - my ($meta_class, $file) = @_; + my ($file) = @_; - my $f = $meta_class && install_any::getFile("$file.$meta_class") || install_any::getFile($file) + my $f = install_any::getFile($file) or do { log::l("can't find $file: $!"); return (undef, undef) }; my ($compssUsers, $gtk_display_compssUsers) = eval join('', <$f>); if ($@) { |