From f3c14a6848d97b18f4baac27213315b3a5f6d023 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Sat, 2 Sep 2000 19:39:02 +0000 Subject: no_comment --- perl-install/Xconfigurator.pm | 2 +- perl-install/install_steps.pm | 3 +- perl-install/install_steps_gtk.pm | 1 + perl-install/install_steps_interactive.pm | 2 +- perl-install/share/compssList | 53 ++++++++++++++++--------------- 5 files changed, 32 insertions(+), 29 deletions(-) (limited to 'perl-install') diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index c6d166523..cbe6e98d8 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -1120,7 +1120,7 @@ If you don't want to use this feature, click on the cancel button."), [ _("Choose the default user:") => { val => \$o->{miscellaneous}{autologuser}, list => \@users, not_edit => 1}, _("Choose the window_manager to run:") => { val => \$o->{miscellaneous}{autologwm}, list => \@wm, not_edit => 1}, ]) ? do { $flag='yes'; - $::isStandalone ? system("urpmi --auto autologin") : $o->pkgs_install("autologin"); + $::isStandalone ? system("urpmi --auto autologin") : $o->pkg_install("autologin"); } : delete $o->{miscellaneaous}{autologuser}; } any::setAutologin($prefix, $o->{miscellaneous}{autologuser}, $o->{miscellaneous}{autologwm}, "/usr/X11R6/bin/startx", $flag); diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 6c0cc9f53..930a8714a 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -407,9 +407,10 @@ Consoles 1,3,4,7 may also contain interesting information"; } my $msec = "$o->{prefix}/etc/security/msec"; + substInFile { s/^xgrp\n//; $_ .= "xgrp\n" if eof } "$msec/group.conf" if -d $msec; substInFile { s/^audio\n//; $_ .= "audio\n" if eof } "$msec/group.conf" if -d $msec; substInFile { s/^cdrom\n//; $_ .= "cdrom\n" if eof } "$msec/group.conf" if -d $msec; - substInFile { s/^xgrp\n//; $_ .= "xgrp\n" if eof } "$msec/group.conf" if -d $msec; + substInFile { s/^cdwriter\n//; $_ .= "cdwriter\n" if eof } "$msec/group.conf" if -d $msec; my $pkg = pkgs::packageByName($o->{packages}, 'urpmi'); if ($pkg && pkgs::packageFlagSelected($pkg)) { diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 0eacebedb..2e66f5ce4 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -287,6 +287,7 @@ sub choosePackagesTree { my $pix_installed= [ gtkcreate_xpm($w->{window}, "$ENV{SHARE_PATH}/rpm-installed.xpm") ]; my $add_parent; $add_parent = sub { + $_[0] or return undef; if (my $w = $wtree{$_[0]}) { return $w } my $s; foreach (split '/', $_[0]) { my $s2 = $s ? "$s/$_" : $_; diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 9305f4d9d..f8a1f58ad 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -335,7 +335,7 @@ sub choosePackages { $o->chooseGroups($packages, $compssUsers, $compssUsersSorted, \$individual) unless $::beginner || $::corporate; #- avoid reselection of package if individual selection is requested and this is not the first time. - if ($first_time || !$individual) { + if (1 || $first_time || !$individual) { my $min_mark = $::beginner ? 10 : $::expert ? 0 : 1; my ($size, $level) = pkgs::fakeSetSelectedFromCompssList($o->{compssListLevels}, $packages, $min_mark, 0, $o->{installClass}); my $max_size = 1 + $size; #- avoid division by zero. diff --git a/perl-install/share/compssList b/perl-install/share/compssList index d355ae5ab..e85322a51 100644 --- a/perl-install/share/compssList +++ b/perl-install/share/compssList @@ -22,7 +22,7 @@ Device3Dfx 0 0 0 DrakConf 84 84 84 DrakProfile 0 0 0 DrakeLogo 20 0 0 -ElectricFence 10 0 96 +ElectricFence 10 0 66 Epplets 57 0 53 Eterm 57 0 53 FaxMail 30 0 0 @@ -83,10 +83,10 @@ WindowMaker 47 0 57 WindowMaker-devel 0 0 30 WsLib 0 0 0 X11R6-contrib 55 0 47 -XFree86 88 0 81 +XFree86 91 0 81 XFree86-100dpi-fonts 56 0 30 XFree86-3DLabs -30 -30 -30 -XFree86-75dpi-fonts 91 0 91 +XFree86-75dpi-fonts 91 0 81 XFree86-8514 -30 -30 -30 XFree86-AGX -30 -30 -30 XFree86-FBDev -30 -30 -30 @@ -194,11 +194,11 @@ audiofile 25 0 26 audiofile-devel 10 0 26 aumix 28 0 2 auth_ldap 5 75 20 -autoconf 15 0 94 +autoconf 15 0 84 autofs 48 45 50 autoirpm -60 -60 -60 autologin 0 0 0 -automake 15 0 94 +automake 15 0 84 awesfx 20 0 13 basesystem 0 0 0 bash 0 0 0 @@ -251,7 +251,7 @@ control-panel 2 0 2 cooledit 0 0 30 corewars 0 15 0 cpio 90 89 90 -cproto 15 0 80 +cproto 15 0 61 cracklib 10 85 35 cracklib-devel 0 0 15 cracklib-dicts 10 82 35 @@ -301,7 +301,7 @@ e2fsprogs-devel 0 0 25 eMusic 65 0 50 ed 45 10 5 ee 58 0 54 -efax 25 99 30 +efax 25 78 30 egcs 5 0 50 egcs-c++ 5 0 50 egcs-cpp 5 0 50 @@ -430,10 +430,10 @@ gkrellm-devel 0 0 20 glade 17 0 57 glademm 0 0 40 glib 1 0 0 -glib-devel 10 0 94 +glib-devel 10 0 87 glibc 1 99 96 glibc-devel 25 0 96 -glibc-profile 1 0 94 +glibc-profile 1 0 54 gltron 10 0 10 gmc 68 0 59 gmp 17 0 71 @@ -483,7 +483,7 @@ gnumeric 67 0 58 gnuplot 65 0 53 gnus 20 0 14 gob 0 0 20 -gperf 12 0 80 +gperf 12 0 72 gphoto 60 0 58 gpm 0 65 87 gpm-devel 10 0 55 @@ -493,7 +493,8 @@ gqcam 0 0 0 gqview 55 0 49 grep 0 92 94 grip 60 0 35 -groff 97 97 97 +groff 0 0 62 +groff-for-man 0 0 0 groff-gxditview 22 0 19 groff-perl 0 0 0 grpmi 0 0 0 @@ -564,15 +565,15 @@ ibtk 20 0 13 ical 40 0 27 icepref 50 0 54 icewm 50 0 78 -icewm-light 87 0 80 +icewm-light 90 0 80 imap 0 80 6 imap-devel 0 0 6 imlib 10 0 71 imlib-cfgeditor 70 0 71 imlib-devel 10 0 50 -imwheel 80 0 58 +imwheel 78 60 73 indent 20 0 91 -indexhtml 0 97 96 +indexhtml 0 87 76 inews 6 12 15 info 20 65 70 info-install 0 0 10 @@ -584,7 +585,7 @@ ipchains 15 98 13 iplog 15 15 15 iproute2 0 30 0 ipvsadm 0 15 0 -ipxutils 20 95 9 +ipxutils 20 85 9 irda-utils 35 0 25 irssi 59 0 57 isapnptools 43 73 73 @@ -695,7 +696,7 @@ ktail 71 0 62 ktelnet 72 0 60 kterm -10 -90 -10 kudzu 97 0 97 -kudzu-devel 0 0 80 +kudzu-devel 0 0 43 kups 60 0 50 kvideogen 73 0 56 kvirc 72 0 56 @@ -715,7 +716,7 @@ lesstif-mwm 2 0 2 lftp 50 78 83 lha 40 25 72 libPropList 10 0 80 -libPropList-devel 0 0 80 +libPropList-devel 0 0 34 libc 10 15 75 libelf 10 15 80 libghttp 10 0 55 @@ -750,7 +751,7 @@ libstdc++-devel 10 0 80 libtabe -15 -90 -15 libtabe-devel -15 -90 -15 libtermcap 10 55 87 -libtermcap-devel 10 0 87 +libtermcap-devel 10 0 64 libtiff 10 0 72 libtiff-devel 10 0 72 libtool 10 0 85 @@ -893,8 +894,8 @@ mc 49 45 31 mcserv 0 40 9 mek 40 0 0 memprof 2 5 65 -menu 99 99 99 -menudrake 81 75 81 +menu 90 0 80 +menudrake 79 75 75 mercury 0 0 45 metamail 40 80 50 mgetty 24 20 9 @@ -953,7 +954,7 @@ ncftp 55 0 49 ncompress 42 79 91 ncpfs 0 0 0 ncurses 0 0 80 -ncurses-devel 10 0 80 +ncurses-devel 10 0 75 nedit 45 20 65 net-tools 95 96 95 netcfg 2 9 2 @@ -1105,7 +1106,7 @@ postgresql-server 0 56 23 postgresql-tcl 0 0 23 postgresql-test 0 0 23 postgresql-tk 0 0 5 -ppp 90 35 82 +ppp 0 0 0 pppoe-linuxconf 0 0 0 pptp-adsl-fr 10 25 15 pptp-client 5 25 10 @@ -1192,10 +1193,10 @@ ruby-doc 0 0 25 ruby-extensions 0 0 25 ruby-gtk 0 0 25 rusers 40 0 34 -rute 15 0 35 +rute -15 -60 -35 rwall 37 0 33 rwho 40 0 32 -rxvt 49 0 96 +rxvt 49 0 80 rxvt-CLE -10 -90 -10 sag 39 35 25 samba 28 99 30 @@ -1255,7 +1256,7 @@ switchdesk-kde 72 0 70 symlinks 23 75 29 sympa 1 40 1 sysklogd 97 97 97 -t1lib 15 0 89 +t1lib 1 0 29 t1lib-devel 10 0 40 taipeifonts -10 0 -10 talk 44 0 39 @@ -1376,7 +1377,7 @@ xfishtank 51 0 45 xgammon 40 0 31 xinetd 0 0 0 xinetd-devel 0 0 0 -xinitrc 85 0 70 +xinitrc 0 0 0 xinput 10 0 30 xjewel 58 0 52 xkobo 57 0 51 -- cgit v1.2.1