From c0d87c4ec03482e6feac003c800ca7d80856d6b6 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 22 Sep 2004 02:24:08 +0000
Subject: don't set {meta_class} from file VERSION when it is already given on
 cmdline

---
 perl-install/install2.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;
-- 
cgit v1.2.1