summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-09-22 02:24:08 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-09-22 02:24:08 +0000
commitc0d87c4ec03482e6feac003c800ca7d80856d6b6 (patch)
tree5f73d6e6db924411d8b6202f5fbfb846e922e9dd
parent136f099fa27fb942010fbcbd7f6b8e633d3ec6c0 (diff)
downloaddrakx-backup-do-not-use-c0d87c4ec03482e6feac003c800ca7d80856d6b6.tar
drakx-backup-do-not-use-c0d87c4ec03482e6feac003c800ca7d80856d6b6.tar.gz
drakx-backup-do-not-use-c0d87c4ec03482e6feac003c800ca7d80856d6b6.tar.bz2
drakx-backup-do-not-use-c0d87c4ec03482e6feac003c800ca7d80856d6b6.tar.xz
drakx-backup-do-not-use-c0d87c4ec03482e6feac003c800ca7d80856d6b6.zip
don't set {meta_class} from file VERSION when it is already given on cmdline
-rw-r--r--perl-install/install2.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 14a707b4d..90afaa98f 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -582,7 +582,7 @@ sub main {
$o->{allowFB} = listlength(cat_("/proc/fb"));
- if (!$::move && !$::testing) {
+ if (!$::move && !$::testing && !$o->{meta_class}) {
my $VERSION = cat__(install_any::getFile("VERSION")) or do { print "VERSION file missing\n"; sleep 5 };
$o->{meta_class} = 'desktop' if $VERSION =~ /desktop|discovery/i;
$o->{meta_class} = 'download' if $VERSION =~ /download/i;