summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2010-01-27 17:25:20 +0000
committerThierry Vignaud <tv@mandriva.org>2010-01-27 17:25:20 +0000
commitec6044c722e8ef5354f236a39ef7d77a19ab70dc (patch)
tree9deea88c51a8b2b7ab6855b681d353767bb8cda9
parent4c958f05954493d20c324083c512376933c9bfc0 (diff)
downloadmgaonline-ec6044c722e8ef5354f236a39ef7d77a19ab70dc.tar
mgaonline-ec6044c722e8ef5354f236a39ef7d77a19ab70dc.tar.gz
mgaonline-ec6044c722e8ef5354f236a39ef7d77a19ab70dc.tar.bz2
mgaonline-ec6044c722e8ef5354f236a39ef7d77a19ab70dc.tar.xz
mgaonline-ec6044c722e8ef5354f236a39ef7d77a19ab70dc.zip
(get_extended_maintenance_url) rename it as
get_extended_maintenance_data() and retrieve more data
-rwxr-xr-xmdkapplet-extended-maintenance-helper7
1 files changed, 4 insertions, 3 deletions
diff --git a/mdkapplet-extended-maintenance-helper b/mdkapplet-extended-maintenance-helper
index 38aa7ba4..af048bb2 100755
--- a/mdkapplet-extended-maintenance-helper
+++ b/mdkapplet-extended-maintenance-helper
@@ -62,13 +62,13 @@ get_extmaint_authentication();
ugtk2::exit(0);
-sub get_extended_maintenance_url() {
+sub get_extended_maintenance_data() {
require Rpmdrake::open_db;
get_product_id();
my @distros = get_distro_list();
return if !@distros;
my $current_apimdv_distro = find_current_distro(@distros);
- $current_apimdv_distro->{'extended-maintenance'};
+ @$current_apimdv_distro{qw(extended-maintenance extended-maintenance-end desktop-update-end basic-update-end)};
}
sub get_extmaint_authentication() {
@@ -84,7 +84,8 @@ sub get_extmaint_authentication() {
$password_restrieved = 1;
});
- my $url = eval { get_extended_maintenance_url() };
+ my ($url, $extended_maintenance_end, $desktop_update_end, $basic_update_end) =
+ eval { get_extended_maintenance_data() };
if (my $err = $@) {
interactive->vnew->ask_warn(N("Error"), N("Failure while retrieving distributions list:")
. "\n$err");