summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-10-31 11:04:47 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-10-31 11:04:47 +0000
commitd501818459ab8aa848a592dfa67e919e0e5385af (patch)
tree3b1c876b83edb936f3d700627d3a7bb86a6d56b0
parentb58ce125d530b18d6c8fe735afacaf93758f25b5 (diff)
downloaddrakx-d501818459ab8aa848a592dfa67e919e0e5385af.tar
drakx-d501818459ab8aa848a592dfa67e919e0e5385af.tar.gz
drakx-d501818459ab8aa848a592dfa67e919e0e5385af.tar.bz2
drakx-d501818459ab8aa848a592dfa67e919e0e5385af.tar.xz
drakx-d501818459ab8aa848a592dfa67e919e0e5385af.zip
don't getFile VERSION in move or testing
-rw-r--r--perl-install/install2.pm14
1 files changed, 8 insertions, 6 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index cc57cd587..7e75d2284 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -558,12 +558,14 @@ sub main {
$o->{allowFB} = listlength(cat_("/proc/fb"));
- my $VERSION = cat__(install_any::getFile("VERSION")) or do { print "VERSION file missing\n"; sleep 5 };
- $::corporate = 1 if $VERSION =~ /corporate/i;
- $o->{meta_class} = 'desktop' if $VERSION =~ /desktop|discovery/i;
- $o->{meta_class} = 'download' if $VERSION =~ /download/i;
- $o->{meta_class} = 'firewall' if $VERSION =~ /firewall/i;
- $o->{meta_class} = 'server' if $VERSION =~ /server|prosuite/i;
+ if (!$::move && !$::testing) {
+ my $VERSION = cat__(install_any::getFile("VERSION")) or do { print "VERSION file missing\n"; sleep 5 };
+ $::corporate = 1 if $VERSION =~ /corporate/i;
+ $o->{meta_class} = 'desktop' if $VERSION =~ /desktop|discovery/i;
+ $o->{meta_class} = 'download' if $VERSION =~ /download/i;
+ $o->{meta_class} = 'firewall' if $VERSION =~ /firewall/i;
+ $o->{meta_class} = 'server' if $VERSION =~ /server|prosuite/i;
+ }
$o->{meta_class} eq 'discovery' and $o->{meta_class} = 'desktop';
if ($::oem) {
$o->{partitioning}{use_existing_root} = 1;