summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2010-01-26 16:55:41 +0000
committerThierry Vignaud <tv@mandriva.org>2010-01-26 16:55:41 +0000
commitcaa68f476b45520097a166b28af3c627a48db91d (patch)
treef038ab72854329e69ac9ea105fdf5d2cb73c817c
parent99ce4a44eed7a892eb2384738a66823d3422ed3c (diff)
downloadcontrol-center-caa68f476b45520097a166b28af3c627a48db91d.tar
control-center-caa68f476b45520097a166b28af3c627a48db91d.tar.gz
control-center-caa68f476b45520097a166b28af3c627a48db91d.tar.bz2
control-center-caa68f476b45520097a166b28af3c627a48db91d.tar.xz
control-center-caa68f476b45520097a166b28af3c627a48db91d.zip
stop retrieving URL on startup (now done in embedded tool)
-rw-r--r--NEWS2
-rwxr-xr-xlib/MDV/Control_Center.pm21
2 files changed, 4 insertions, 19 deletions
diff --git a/NEWS b/NEWS
index 29b4b643..ca291c97 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- stop retrieving URL on startup (now done in embedded tool)
+
Version 12.18.2 - 25 January 2010, Thierry Vignaud
- translations updates
diff --git a/lib/MDV/Control_Center.pm b/lib/MDV/Control_Center.pm
index c4ba1bfe..1bacb2b0 100755
--- a/lib/MDV/Control_Center.pm
+++ b/lib/MDV/Control_Center.pm
@@ -36,22 +36,6 @@ our @EXPORT = qw(
our ($version) = cat_("/etc/mandrakelinux-release") =~ /\b(\d+\.\d+)/;
-my $extended_maintenance_url;
-
-eval {
- use lib qw(/usr/lib/libDrakX/drakfirsttime);
- require mdkonline;
- mdkonline->import;
- require Rpmdrake::open_db;
- get_product_id();
- my @distros = get_distro_list();
- return if !@distros;
- my $current_apimdv_distro = find_current_distro(@distros);
- $extended_maintenance_url = $current_apimdv_distro->{'extended-maintenance'};
-};
-if (my $err = $@) {
- warn "failed to retrieve distro list: $err\n";
-}
#-------------------------------------------------------------
# paths
@@ -621,14 +605,13 @@ our %programs =
},
- if_($extended_maintenance_url,
"Extended Maintenance" =>
{
- binary => "$sbindir/mdkapplet-extended-maintenance-helper $version $extended_maintenance_url",
+ binary => "$sbindir/mdkapplet-extended-maintenance-helper $version",
embedded => 1,
description => N("Access to extended maintenance"),
icon => 'extended_maintenance',
- }),
+ },
"Tomoyo Policy" =>