summaryrefslogtreecommitdiffstats
path: root/globetrotter/make_live
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-06-29 03:28:23 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-06-29 03:28:23 +0000
commitac3aa0b57d8a886c74ca350a18bc0408fa291646 (patch)
treed67f3a408a4d87421459bbe53f36e89c0e41dff7 /globetrotter/make_live
parent5144d0d8845e91d41bf8c25c04eae7f517596060 (diff)
downloaddrakx-ac3aa0b57d8a886c74ca350a18bc0408fa291646.tar
drakx-ac3aa0b57d8a886c74ca350a18bc0408fa291646.tar.gz
drakx-ac3aa0b57d8a886c74ca350a18bc0408fa291646.tar.bz2
drakx-ac3aa0b57d8a886c74ca350a18bc0408fa291646.tar.xz
drakx-ac3aa0b57d8a886c74ca350a18bc0408fa291646.zip
unselect uim since mdk10 package of uim IM break first time wizard
when selecting english
Diffstat (limited to 'globetrotter/make_live')
-rwxr-xr-xglobetrotter/make_live14
1 files changed, 10 insertions, 4 deletions
diff --git a/globetrotter/make_live b/globetrotter/make_live
index f2d5f0299..00c560c78 100755
--- a/globetrotter/make_live
+++ b/globetrotter/make_live
@@ -237,12 +237,18 @@ sub installPackages() {
pkgs::setSelectedFromCompssList($o->{packages}, \%compssUsersChoice, 4, 0);
+ my $unselect = sub {
+ my ($pkg) = @_;
+ my $p = pkgs::packageByName($o->{packages}, $pkg);
+ pkgs::unselectPackage($o->{packages}, $p) if $p;
+ };
+
# unselect some packages whose services fsck up the box and whose services are not enabled by appropriate tools:
# (shorewall must be deselected before iptables is)
- foreach (qw(at hpoj shorewall iptables ntp tmdns zcip )) {
- my $p = pkgs::packageByName($o->{packages}, $_);
- pkgs::unselectPackage($o->{packages}, $p) if $p;
- }
+ $unselect->($_) foreach qw(at hpoj shorewall iptables ntp tmdns zcip );
+
+ # unselect uim since uim IM break first time wizard when selecting english:
+ $unselect->($_) foreach qw(uim-applet uim libuim0);
my @toInstall = pkgs::packagesToInstall($o->{packages});
local $ENV{DURING_INSTALL} = 1;