diff options
author | Thierry Vignaud <tv@mandriva.org> | 2009-03-23 16:16:18 +0000 |
---|---|---|
committer | Thierry Vignaud <tv@mandriva.org> | 2009-03-23 16:16:18 +0000 |
commit | dbaf8aaf7216f72d4bccbab0c6aa643a581547ab (patch) | |
tree | da3fe140c8fbff7507d3a310144d46dbd9a12af2 | |
parent | 1a66093ca5f5ffac11eba7206d74e2c93a51517a (diff) | |
download | drakx-dbaf8aaf7216f72d4bccbab0c6aa643a581547ab.tar drakx-dbaf8aaf7216f72d4bccbab0c6aa643a581547ab.tar.gz drakx-dbaf8aaf7216f72d4bccbab0c6aa643a581547ab.tar.bz2 drakx-dbaf8aaf7216f72d4bccbab0c6aa643a581547ab.tar.xz drakx-dbaf8aaf7216f72d4bccbab0c6aa643a581547ab.zip |
(ask_deselect_media__copy_on_disk) more adjustments for ->{selected} => ->{ignore} switch
-rw-r--r-- | perl-install/install/steps_gtk.pm | 6 | ||||
-rw-r--r-- | perl-install/install/steps_interactive.pm | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index 7affd8f24..8b836ecd6 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -715,7 +715,7 @@ sub ask_deselect_media__copy_on_disk { my ($o, $hdlists, $o_copy_rpms_on_disk) = @_; my @names = uniq(map { $_->{name} } @$hdlists); - my %selection = map { $_->{name} => $_->{selected} } @$hdlists; + my %selection = map { $_->{name} => !$_->{ignore} } @$hdlists; if (@names > 1 || $o_copy_rpms_on_disk) { my $w = ugtk2->new(N("Media Selection")); @@ -758,8 +758,8 @@ It will then continue from the hard drive and the packages will remain available ); $w->main; } - $_->{selected} = $selection{$_->{name}} foreach @$hdlists; - log::l("keeping media " . join ',', map { $_->{rpmsdir} } grep { $_->{selected} } @$hdlists); + !$_->{ignore} = $selection{$_->{name}} foreach @$hdlists; + log::l("keeping media " . join ',', map { $_->{rpmsdir} } grep { !$_->{ignore} } @$hdlists); } 1; diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index a956419a7..03d89d033 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -342,8 +342,8 @@ It will then continue from the hard drive and the packages will remain available { type => 'bool', text => N("Copy whole CDs"), val => $o_copy_rpms_on_disk }, ), ]); - $_->{selected} = $selection{$_->{name}} foreach @$hdlists; - log::l("keeping media " . join ',', map { $_->{rpmsdir} } grep { $_->{selected} } @$hdlists); + !$_->{ignore} = $selection{$_->{name}} foreach @$hdlists; + log::l("keeping media " . join ',', map { $_->{rpmsdir} } grep { !$_->{ignore} } @$hdlists); } sub while_suspending_time { |