diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-01-07 21:11:15 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-01-07 21:11:15 +0000 |
| commit | bcdadca806b3b301a69d1ff6f69b52fe156b1bb4 (patch) | |
| tree | f1ce98f6833a0e8ceed3acc41bea6af3d68f738f | |
| parent | 5a83b0a889e7bb5e517d691953cd34beedfc8ed3 (diff) | |
| download | drakx-bcdadca806b3b301a69d1ff6f69b52fe156b1bb4.tar drakx-bcdadca806b3b301a69d1ff6f69b52fe156b1bb4.tar.gz drakx-bcdadca806b3b301a69d1ff6f69b52fe156b1bb4.tar.bz2 drakx-bcdadca806b3b301a69d1ff6f69b52fe156b1bb4.tar.xz drakx-bcdadca806b3b301a69d1ff6f69b52fe156b1bb4.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/Xconfigurator.pm | 7 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 4 | ||||
| -rw-r--r-- | perl-install/interactive_newt.pm | 11 | ||||
| -rw-r--r-- | perl-install/share/compssList | 5 |
4 files changed, 16 insertions, 11 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 43b617965..9db1dcdd5 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -299,7 +299,12 @@ sub testFinalConfig($;$$) { #- create a link from the non-prefixed /tmp/.X11-unix/X9 to the prefixed one #- that way, you can talk to :9 without doing a chroot - symlinkf "$prefix/tmp/.X11-unix/X9", "/tmp/.X11-unix/X9" if $prefix; + #- but take care of non X11 install :-) + if (-d "/tmp/.X11-unix") { + symlinkf "$prefix/tmp/.X11-unix/X9", "/tmp/.X11-unix/X9" if $prefix; + } else { + symlinkf "$prefix/tmp/.X11-unix", "/tmp/.X11-unix" if $prefix; + } #- restart_xfs; my $f_err = "$prefix/tmp/Xoutput"; diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index a6d4ff22c..d4a2f248e 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -320,7 +320,7 @@ sub installPackages { local *pkgs::installCallback = sub { my $m = shift; if ($m =~ /^Starting installation/) { - $total = $_[2]; + $total = $_[1]; } elsif ($m =~ /^Starting installing package/) { my $name = $_[0]; $w->set(_("Installing package %s\n%d%%", $name, $total && 100 * $current / $total)); @@ -854,7 +854,7 @@ sub miscellaneous { 4 => _("High"), 5 => _("Paranoid"), ); - delete @l{1,5} unless $::expert; + delete @l{0,1,5} unless $::expert; install_steps::miscellaneous($o); my $u = $o->{miscellaneous} ||= {}; diff --git a/perl-install/interactive_newt.pm b/perl-install/interactive_newt.pm index 16831a8df..d16e3632f 100644 --- a/perl-install/interactive_newt.pm +++ b/perl-install/interactive_newt.pm @@ -20,7 +20,7 @@ sub new() { Newt::changeColors; Newt::Cls; Newt::SetSuspendCallback; - open STDERR,">/dev/null"; + open STDERR,">/dev/null" if $::isStandalone; bless {}, $_[0]; } @@ -50,13 +50,16 @@ sub ask_from_listW { my ($title, @okcancel) = ref $title_ ? @$title_ : ($title_, _("Ok"), _("Cancel")); my $mesg = join("\n", @$messages); + my $len = 0; $len += length($_) foreach @$l; if (@$l == 1) { Newt::WinMessage($title, @$l, $mesg); $l->[0]; - } elsif (@$l == 2) { +#- because newt will not try to remove window if bigger than screen ! + } elsif (@$l == 2 && $len < 64) { $l->[Newt::WinChoice($title, @$l, $mesg) - 1]; - } elsif (@$l == 3) { +#- because newt will not try to remove window if bigger than screen ! + } elsif (@$l == 3 && $len < 64) { $l->[Newt::WinTernary($title, @$l, $mesg) - 1]; } else { my $special = !@okcancel; @@ -177,7 +180,7 @@ sub ask_from_entries_refW { map { &{$updates[$_]} } 0..$#widgets; $form->FormDestroy; Newt::PopWindow; - $$r != $$cancel; + $$r != $$cancel; } diff --git a/perl-install/share/compssList b/perl-install/share/compssList index ff0dea036..ea71aaa58 100644 --- a/perl-install/share/compssList +++ b/perl-install/share/compssList @@ -27,7 +27,6 @@ MySQL_GPL-resolveip 2 50 10 MySQL_GPL-shared-libs 2 50 10 ORBit 0 0 55 ORBit-devel 10 0 55 -Propaganda-For-E 58 0 54 SDL 50 0 25 SDL-devel 1 0 90 SVGATextMode 1 0 0 @@ -341,7 +340,6 @@ gzip 98 98 98 hdparm 98 98 98 helptool 55 0 53 hexedit 91 91 91 -howto-html 55 22 53 ibtk 20 0 13 ical 40 0 27 iceconf 50 0 54 @@ -747,7 +745,7 @@ postgresql-tcl 0 0 23 postgresql-test 0 0 23 ppa 1 15 15 ppp 90 35 82 -pptp-adsl-alcatel 10 25 15 +pptp-adsl-fr 10 25 15 pptp-client 5 25 10 printtool 58 0 46 procinfo 24 15 96 @@ -832,7 +830,6 @@ slrn-pull 35 0 45 sndconfig 90 0 90 sox 41 32 80 sox-devel 13 0 70 -space 45 0 35 space_sounds 52 0 55 squid 0 45 16 stat 5 55 45 |