From 0cfd2253c3bdd2f17b211449b7a4b16ffff8a01c Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 6 Dec 2006 14:22:53 +0000 Subject: always send the ISO2 country code --- mdkonline | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mdkonline') diff --git a/mdkonline b/mdkonline index a83365af..c192d453 100755 --- a/mdkonline +++ b/mdkonline @@ -166,14 +166,14 @@ my $wiz = formatAlaTeX(N("In order to benefit from Mandriva Online services,\nwe are about to upload your configuration.\n\nThe Wizard will now send the following information to Mandriva:\n\n1) the list of packages you have installed on your system,\n\n2) your hardware configuration.\n\nIf you feel uncomfortable by that idea, or do not want to benefit from this service,\nplease press 'Cancel'. By pressing 'Next', you allow us to keep you informed\nabout security updates and useful upgrades via personalized email alerts.\nFurthermore, you benefit from discounted paid support services on\nwww.mandrivaexpert.com.")), data => [ { } ], complete => sub { - my $err = send_conf_via_soap($login, $password, $boxname, $descboxname, $country); + my $err = send_conf_via_soap($login, $password, $boxname, $descboxname, $locale->{country}); # if authentication failed with "No host for this id", just transparently register the host again: # (eg: when host was deleted through the web interface) if ($err ne 'OK') { if ($err =~ /No host for this id/) { log::explanations("registring again the host because the id is lost (deleted through the web interface?"); substInFile { undef $_ if /HOST_ID|HOST_NAME/ } '/etc/sysconfig/mdkonline'; - $err = send_conf_via_soap($login, $password, $boxname, $descboxname, $country); + $err = send_conf_via_soap($login, $password, $boxname, $descboxname, $locale->{country}); } return $err eq 'OK'; $in->ask_warn(N("Error"), N("Connection problem") . "\n\n" . N("Problem occurs when uploading files, please try again") . "\n\n" . $err); @@ -251,7 +251,7 @@ my $wiz = if (!$ia && $login && $password && $boxname) { my $is_success = mdkonline::create_authenticate_account('authenticate', $login, $password); if ($is_success eq 'OK') { - my $sendconfres = send_conf_via_soap($login, $password, $boxname, $descboxname, $country); + my $sendconfres = send_conf_via_soap($login, $password, $boxname, $descboxname, $countries{$country}); if ($sendconfres eq 'OK') { mdkonline::automated_upgrades(); output_p($logfile, N("Configuration uploaded successfully")); -- cgit v1.2.1