diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-09-16 20:35:31 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-09-16 20:35:31 +0000 |
| commit | 31fb2c2e9d3025bc7dbad038c632ab8a34a9a310 (patch) | |
| tree | 1d97767119a0f13e5b5c70ac0283dd4dd36a12f0 | |
| parent | 1130e84c3a27b0c1c6a05981137975b5c84bd9df (diff) | |
| download | drakx-31fb2c2e9d3025bc7dbad038c632ab8a34a9a310.tar drakx-31fb2c2e9d3025bc7dbad038c632ab8a34a9a310.tar.gz drakx-31fb2c2e9d3025bc7dbad038c632ab8a34a9a310.tar.bz2 drakx-31fb2c2e9d3025bc7dbad038c632ab8a34a9a310.tar.xz drakx-31fb2c2e9d3025bc7dbad038c632ab8a34a9a310.zip | |
more up to my need ALL flag in compssUsersChoice
| -rw-r--r-- | perl-install/install_any.pm | 3 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 6990cc418..01178f014 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -357,6 +357,9 @@ sub setPackages { pkgs::read_rpmsrate($o->{packages}, getFile("Mandrake/base/rpmsrate")); ($o->{compssUsers}, $o->{compssUsersSorted}) = pkgs::readCompssUsers($o->{meta_class}); + if ($::auto_install && $o->{compssUsersChoice}{ALL}) { + $o->{compssUsersChoice}{$_} = 1 foreach map { @{$o->{compssUsers}{$_}{flags}} } @{$o->{compssUsersSorted}}; + } if (!$o->{compssUsersChoice} && !$o->{isUpgrade}) { #- by default, choose: $o->{compssUsersChoice}{$_} = 1 foreach 'GNOME', 'KDE', 'CONFIG'; diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 14e0ff633..b938aa710 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -708,7 +708,7 @@ sub setSelectedFromCompssList { my ($rate, @flags) = packageRateRFlags($p); next if !$rate || $rate < $min_level || - !$compssUsersChoice->{ALL} && grep { !grep { /^!(.*)/ ? !$compssUsersChoice->{$1} : $compssUsersChoice->{$_} } split('\|\|') } @flags; + grep { !grep { /^!(.*)/ ? !$compssUsersChoice->{$1} : $compssUsersChoice->{$_} } split('\|\|') } @flags; #- determine the packages that will be selected when #- selecting $p. the packages are not selected. |