summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2010-01-27 17:25:52 +0000
committerThierry Vignaud <tv@mandriva.org>2010-01-27 17:25:52 +0000
commit8481c7510c8d1ce89576f621212e526c7886780d (patch)
treeacd2cd5246cd7d4c1b2d30734fa371d584fe126a
parent02a375220725572f0c536b419001ba398377f683 (diff)
downloadmgaonline-8481c7510c8d1ce89576f621212e526c7886780d.tar
mgaonline-8481c7510c8d1ce89576f621212e526c7886780d.tar.gz
mgaonline-8481c7510c8d1ce89576f621212e526c7886780d.tar.bz2
mgaonline-8481c7510c8d1ce89576f621212e526c7886780d.tar.xz
mgaonline-8481c7510c8d1ce89576f621212e526c7886780d.zip
(read_config) rename it as read_sys_config() for consistency with
read_local_config()
-rwxr-xr-xmdkapplet2
-rwxr-xr-xmdkapplet-extended-maintenance-helper2
-rw-r--r--mdkonline.pm4
3 files changed, 4 insertions, 4 deletions
diff --git a/mdkapplet b/mdkapplet
index fd0a0c01..fd6b542c 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -52,7 +52,7 @@ if (!find { $_ eq '--auto-update' } @ARGV) {
my $online_site = "http://www.mandrivalinux.com/";
my ($menu, $timeout, $network_timeout, $state_global, $sub_state);
-read_config();
+read_sys_config();
$config{UPDATE_FREQUENCY} ||= 3*60*60; # default to 3hours
if ($::testing) {
$config{FIRST_CHECK_DELAY} = 1 * 1000; # 1 second
diff --git a/mdkapplet-extended-maintenance-helper b/mdkapplet-extended-maintenance-helper
index 4181381c..ebb9a118 100755
--- a/mdkapplet-extended-maintenance-helper
+++ b/mdkapplet-extended-maintenance-helper
@@ -58,7 +58,7 @@ if ($@) {
*interactive::gtk::add_padding = sub { $_[0] };
}
-read_config();
+read_sys_config();
get_extmaint_authentication();
ugtk2::exit(0);
diff --git a/mdkonline.pm b/mdkonline.pm
index c9ee2df0..9f876cca 100644
--- a/mdkonline.pm
+++ b/mdkonline.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(find_current_distro
is_enterprise_media_supported
is_extmaint_supported
is_restricted_media_supported
- read_config
+ read_sys_config
translate_product
xml2perl
%config
@@ -59,7 +59,7 @@ use log;
our $config_file = '/etc/sysconfig/mdkapplet';
my $release_file = find { -f $_ } '/etc/mandriva-release', '/etc/mandrakelinux-release', '/etc/mandrake-release', '/etc/redhat-release';
-sub read_config() {
+sub read_sys_config() {
%config = getVarsFromSh($config_file);
}