diff options
| author | Angelo Naselli <anaselli@linux.it> | 2014-12-05 16:59:16 +0100 |
|---|---|---|
| committer | Angelo Naselli <anaselli@linux.it> | 2014-12-05 16:59:16 +0100 |
| commit | 99d536312edb82a8af4df60348a43a31859f1db8 (patch) | |
| tree | 9dac23b3cde984d7f0b85f855d84f19044364a59 /lib | |
| parent | a7b02f6cee1153dd46a70323157b301c45065589 (diff) | |
| download | manatools-99d536312edb82a8af4df60348a43a31859f1db8.tar manatools-99d536312edb82a8af4df60348a43a31859f1db8.tar.gz manatools-99d536312edb82a8af4df60348a43a31859f1db8.tar.bz2 manatools-99d536312edb82a8af4df60348a43a31859f1db8.tar.xz manatools-99d536312edb82a8af4df60348a43a31859f1db8.zip | |
added dont_ask_again to contanct mirror request
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/AdminPanel/Rpmdragora/pkg.pm | 13 | ||||
| -rw-r--r-- | lib/AdminPanel/rpmdragora.pm | 1 |
2 files changed, 10 insertions, 4 deletions
diff --git a/lib/AdminPanel/Rpmdragora/pkg.pm b/lib/AdminPanel/Rpmdragora/pkg.pm index 8476d254..f3a6b44a 100644 --- a/lib/AdminPanel/Rpmdragora/pkg.pm +++ b/lib/AdminPanel/Rpmdragora/pkg.pm @@ -259,15 +259,20 @@ sub warn_about_media { if (@update_medias > 0) { if (!$options{skip_updating_mu} && !$is_update_media_already_asked) { $is_update_media_already_asked = 1; - $::rpmdragora_options{'no-confirmation'} or interactive_msg($loc->N("Confirmation"), -$loc->N("I need to contact the mirror to get latest update packages. + if (!$::rpmdragora_options{'no-confirmation'}) { + my $choice = interactive_msg($loc->N("Confirmation"), + $loc->N("I need to contact the mirror to get latest update packages. Please check that your network is currently running. -Is it ok to continue?"), yesno => 1 +Is it ok to continue?" + ), yesno => 1, dont_ask_again => 1, # TODO widget => gtknew('CheckButton', text => $loc->N("Do not ask me next time"), # active_ref => \$::rpmdragora_options{'no-confirmation'} # ) - ) or return(-1); + ); + $::rpmdragora_options{'no-confirmation'} = $choice->{dont_ask_again}; + return(-1) if !$choice->{value}; + } writeconf(); urpm::media::select_media($urpm, map { $_->{name} } @update_medias); update_sources($urpm, noclean => 1, medialist => [ map { $_->{name} } @update_medias ]); diff --git a/lib/AdminPanel/rpmdragora.pm b/lib/AdminPanel/rpmdragora.pm index c5f0f6c8..c82c503b 100644 --- a/lib/AdminPanel/rpmdragora.pm +++ b/lib/AdminPanel/rpmdragora.pm @@ -363,6 +363,7 @@ sub interactive_msg { if ($info->{checkbox}) { my $value = $retVal; + $retVal = undef; $retVal->{value} = $value; $retVal->{dont_ask_again} = $info->{checkbox}->isChecked(); } |