summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-02-13 14:43:26 +0000
committerThierry Vignaud <tv@mandriva.org>2007-02-13 14:43:26 +0000
commit2fd081474dd4fa60d5d536c07b5d19131f265f7a (patch)
treeeb8659fe14f5dc09753507e2e5110faf8b4f648b
parent422a1fdb785356423fd276a2f7caa85b7e336f67 (diff)
downloadmgaonline-2fd081474dd4fa60d5d536c07b5d19131f265f7a.tar
mgaonline-2fd081474dd4fa60d5d536c07b5d19131f265f7a.tar.gz
mgaonline-2fd081474dd4fa60d5d536c07b5d19131f265f7a.tar.bz2
mgaonline-2fd081474dd4fa60d5d536c07b5d19131f265f7a.tar.xz
mgaonline-2fd081474dd4fa60d5d536c07b5d19131f265f7a.zip
ask confirmation for country earlier so that it does be sent to mdvonline server
-rwxr-xr-xmdkonline6
1 files changed, 1 insertions, 5 deletions
diff --git a/mdkonline b/mdkonline
index 6a2a1e1a..5b631b93 100755
--- a/mdkonline
+++ b/mdkonline
@@ -140,6 +140,7 @@ my $wiz =
data => sub {
[
{ label => N("Email address:"), val => \$login },
+ { label => N("Country"), val => \$country, type => "combo", list => [ sort keys %countries ], not_edit => 0 }
{ label => N("Password:"), val => \$password, hidden => 1 },
{ label => N("Machine name:"), val => \$boxname },
{ label => N("Machine description:"), val => \$descboxname },
@@ -226,11 +227,6 @@ my $wiz =
},
upload => {
name => formatAlaTeX(N("Your upload was successful!") . "\n\n" . N("From now you will receive on security and updates \nannouncements thanks to Mandriva Online.") . "\n\n" . N("Mandriva Online offers you the ability to automate the updates.\nA program will run regulary in your system waiting for new updates\n")),
- data => sub {
- [
- { label => N("Country"), val => \$country, type => "combo", list => [ sort keys %countries ], not_edit => 0 }
- ];
- },
post => sub {
mdkonline::automated_upgrades();
#mdkonline::clean_confdir();