summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-11-26 15:45:59 +0000
committerThierry Vignaud <tv@mandriva.org>2009-11-26 15:45:59 +0000
commit7a2d6688282e869e90d12a71ce21b339f8dae7cf (patch)
tree34113a9f3b8ba6b21358dd3859d0f3bd1f297bae
parent90061efdc5e8f6bdd0858bf2405e9a53b7f65a0e (diff)
downloadmgaonline-7a2d6688282e869e90d12a71ce21b339f8dae7cf.tar
mgaonline-7a2d6688282e869e90d12a71ce21b339f8dae7cf.tar.gz
mgaonline-7a2d6688282e869e90d12a71ce21b339f8dae7cf.tar.bz2
mgaonline-7a2d6688282e869e90d12a71ce21b339f8dae7cf.tar.xz
mgaonline-7a2d6688282e869e90d12a71ce21b339f8dae7cf.zip
read /etc/product_id once at startup instead of lazy read it later
-rwxr-xr-xmdkapplet4
1 files changed, 1 insertions, 3 deletions
diff --git a/mdkapplet b/mdkapplet
index 459851dd..ddb11fc7 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -254,6 +254,7 @@ my ($download_dir, $download_all);
}
my ($new_distro, $no_more_supported);
+get_product_id();
shouldStart() or die "$localfile should be set to TRUE: please use --force or -f option to launch applet\n";
@@ -312,7 +313,6 @@ sub get_distro_list() {
}
sub is_there_a_new_distributions() {
- get_product_id();
return if $product_id->{product} =~ /Flash/;
# sanity check for cooker:
@@ -606,7 +606,6 @@ sub silentCheck() {
}
if (!@update_medias) {
- get_product_id();
if (is_enterprise_media_supported()) {
checker_exit('no_enterprise_update_medium');
} else {
@@ -810,7 +809,6 @@ sub get_enabled_restricted_media {
sub is_restricted_media_configured {
my ($urpm) = @_;
- get_product_id();
return 1 if !is_restricted_media_supported();
my @restricted_media = get_enabled_restricted_media($urpm);