summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaouda Lo <daouda@mandriva.com>2003-10-22 15:50:30 +0000
committerDaouda Lo <daouda@mandriva.com>2003-10-22 15:50:30 +0000
commit13a83c6506f8a6990931ba3e908d72b09debe6c4 (patch)
tree8893f6facbf0ce126c23568fcb9ad8b6f9ddd4b7
parentfd8d42602abe5780652db9f1baad5657de45b480 (diff)
downloadmgaonline-13a83c6506f8a6990931ba3e908d72b09debe6c4.tar
mgaonline-13a83c6506f8a6990931ba3e908d72b09debe6c4.tar.gz
mgaonline-13a83c6506f8a6990931ba3e908d72b09debe6c4.tar.bz2
mgaonline-13a83c6506f8a6990931ba3e908d72b09debe6c4.tar.xz
mgaonline-13a83c6506f8a6990931ba3e908d72b09debe6c4.zip
- don't end wizard if no Mirror site is choosen.
- Force mdkupdate use
-rwxr-xr-xmdkonline21
1 files changed, 9 insertions, 12 deletions
diff --git a/mdkonline b/mdkonline
index 2e6eb640..8ebb1a51 100755
--- a/mdkonline
+++ b/mdkonline
@@ -146,16 +146,10 @@ sub gtk_main_quit {
[ -f "/root/$login.$passwd.$box_name.online.log.bz2.uue" ] && unlink ("/root/$login.$passwd.$box_name.online.log.bz2.uue");
[ -f "/root/$login.$passwd.$box_name.online.log.bz2" ] && unlink ("/root/$login.$passwd.$box_name.online.log.bz2");
}
-
- # setting up the automated updates
- if ($check_cron->get_active()) {
- automated_upgrades();
- }
# quit
print N("Quitting Wizard\n");
Gtk2->main_quit;
}
-
sub isalphanum {
my ($str) = @_;
if ($str =~ /^[[:alnum:]]+$/) {
@@ -164,9 +158,11 @@ sub isalphanum {
return 0;
}
}
-
sub on_end_clicked {
- gtk_main_quit();
+ if ($check_cron->get_active()) {
+ my $mirror = $gtkcombo_mirror->entry->get_text();
+ if ($mirror) { automated_upgrades(); gtk_main_quit() } else { info_popup(N('Empty Mirror'), N("Empty Mirror. Please choose a place.")) }
+ }
}
sub on_next_clicked {
@@ -413,7 +409,8 @@ sub step_wizard {
my $frame_auto = new Gtk2::Frame(N("automated Upgrades"));
my $vbox_frame_auto = new Gtk2::VBox(0,0);
$frame_auto->add($vbox_frame_auto);
- $vbox_frame_auto->pack_start($check_cron,$false ,$false,1);
+# $vbox_frame_auto->pack_start($check_cron,$false ,$false,1);
+ $check_cron->set_active(1);
#$check_cron->set_uposition(70,245);
my $hboxfr1 = new Gtk2::HBox(0,0);
my $hboxfr2 = new Gtk2::HBox(0,0);
@@ -421,8 +418,8 @@ sub step_wizard {
$hboxfr2->pack_start($label_mirror,$true ,$true,5);
$gtkcombo_mirror->set_popdown_strings('',sort(keys %locations));
$hboxfr2->pack_end($gtkcombo_mirror,$true ,$true,5);
- $hboxfr1->set_sensitive(0);
- $hboxfr2->set_sensitive(0);
+ $hboxfr1->set_sensitive(1);
+ $hboxfr2->set_sensitive(1);
$check_cron->signal_connect (clicked => sub { my $test_cron=$check_cron->get_active();
$hboxfr1->set_sensitive($test_cron);
$hboxfr2->set_sensitive($test_cron); });
@@ -504,7 +501,7 @@ sub set_boxname {
$box->set_text($b{BOX});
}
-sub info_popup () {
+sub info_popup {
# must have been translated by the caller
my ($title,$text) = @_;
my $popup = new Gtk2::Dialog();