diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2003-02-13 19:58:35 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2003-02-13 19:58:35 +0000 |
| commit | 717364ef8408086bb129ba10cf30361c82af3f74 (patch) | |
| tree | 56df7b7bc765a433e52bf12d95e5dc66b254baae | |
| parent | 94d5004633a8bd3b77d30224cc6d6086c05ca50d (diff) | |
| download | drakx-717364ef8408086bb129ba10cf30361c82af3f74.tar drakx-717364ef8408086bb129ba10cf30361c82af3f74.tar.gz drakx-717364ef8408086bb129ba10cf30361c82af3f74.tar.bz2 drakx-717364ef8408086bb129ba10cf30361c82af3f74.tar.xz drakx-717364ef8408086bb129ba10cf30361c82af3f74.zip | |
don't allow going back from accept_licenser to select_language, hence allow removing langs images before downloading huge CJK fonts
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 2 | ||||
| -rw-r--r-- | perl-install/lang.pm | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index b2e6e8902..2001fc83e 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -86,7 +86,7 @@ sub acceptLicense { interactive_help_id => 'acceptLicense', callbacks => { ok_disabled => sub { $r eq 'Refuse' } }, }, - [ { list => [ N_("Accept"), N_("Refuse") ], val => \$r, type => 'list' } ]) or die 'already displayed'; + [ { list => [ N_("Accept"), N_("Refuse") ], val => \$r, type => 'list' } ]); } #------------------------------------------------------------------------------ diff --git a/perl-install/lang.pm b/perl-install/lang.pm index 1e3e88db3..2b8348239 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -485,6 +485,7 @@ sub l2pango_font { if (common::usingRamdisk()) { if ($charsets{$charset}[0] !~ /lat|koi|UniCyr/) { install_any::remove_bigseldom_used(); + unlink glob_('/usr/share/langs/*'); #- remove langs images my @generic_fontfiles = qw(/usr/X11R6/lib/X11/fonts/12x13mdk.pcf.gz /usr/X11R6/lib/X11/fonts/18x18mdk.pcf.gz); #- need to unlink first because the files actually exist (and are void); they must exist #- because if not, when gtk starts, pango will recompute its cache file and exclude them |