diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-10-01 02:11:16 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-10-01 02:11:16 +0000 |
| commit | 6e7e1f7edf04617c2024a4eb912706c5c68ab2fc (patch) | |
| tree | 7e453aca628f9520f5f2743fbe5657e69c93e3ea | |
| parent | fedea72292604778baa7341b72e2dd458ef2239c (diff) | |
| download | drakx-6e7e1f7edf04617c2024a4eb912706c5c68ab2fc.tar drakx-6e7e1f7edf04617c2024a4eb912706c5c68ab2fc.tar.gz drakx-6e7e1f7edf04617c2024a4eb912706c5c68ab2fc.tar.bz2 drakx-6e7e1f7edf04617c2024a4eb912706c5c68ab2fc.tar.xz drakx-6e7e1f7edf04617c2024a4eb912706c5c68ab2fc.zip | |
- prosuite is now named powerpackplus
- simplify the code searching for the meta_class
| -rw-r--r-- | perl-install/install2.pm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 08311e9a7..752d7d77e 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -585,14 +585,16 @@ sub main { 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; - $o->{meta_class} = 'firewall' if $VERSION =~ /firewall/i; - $o->{meta_class} = 'server' if $VERSION =~ /server|prosuite/i; + my @classes = qw(powerpackplus powerpack desktop download server firewall); + if (my $meta_class = find { $VERSION =~ /$_/i } @classes) { + $o->{meta_class} = $meta_class; + } $o->{distro_type} = 'community' if $VERSION =~ /community/i; $o->{distro_type} = 'cooker' if $VERSION =~ /cooker/i; } $o->{meta_class} eq 'discovery' and $o->{meta_class} = 'desktop'; + $o->{meta_class} eq 'powerpackplus' and $o->{meta_class} = 'server'; + log::l("meta_class $o->{meta_class}"); if ($::oem) { $o->{partitioning}{use_existing_root} = 1; |