aboutsummaryrefslogtreecommitdiffstats
path: root/lib/AdminPanel/rpmdragora.pm
diff options
context:
space:
mode:
authorAngelo Naselli <anaselli@linux.it>2014-06-30 12:00:57 +0200
committerAngelo Naselli <anaselli@linux.it>2014-06-30 12:00:57 +0200
commit6a8c44ff7ac1f94c8987ea1d4301332d99e71fda (patch)
tree1fa343dac43265a72ab44e28df85b7875e43fe95 /lib/AdminPanel/rpmdragora.pm
parent6103628fc64ba9ec2cc6c915477071e3395d7535 (diff)
downloadcolin-keep-6a8c44ff7ac1f94c8987ea1d4301332d99e71fda.tar
colin-keep-6a8c44ff7ac1f94c8987ea1d4301332d99e71fda.tar.gz
colin-keep-6a8c44ff7ac1f94c8987ea1d4301332d99e71fda.tar.bz2
colin-keep-6a8c44ff7ac1f94c8987ea1d4301332d99e71fda.tar.xz
colin-keep-6a8c44ff7ac1f94c8987ea1d4301332d99e71fda.zip
changed to fully qualified calls
Diffstat (limited to 'lib/AdminPanel/rpmdragora.pm')
-rw-r--r--lib/AdminPanel/rpmdragora.pm13
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/AdminPanel/rpmdragora.pm b/lib/AdminPanel/rpmdragora.pm
index 808bf52..6130e20 100644
--- a/lib/AdminPanel/rpmdragora.pm
+++ b/lib/AdminPanel/rpmdragora.pm
@@ -34,6 +34,7 @@ use urpm::media;
use MDK::Common;
use MDK::Common::System;
use MDK::Common::String;
+use MDK::Common::File;
use urpm;
use urpm::cfg;
use URPM;
@@ -116,7 +117,7 @@ use Glib;
Locale::gettext::bind_textdomain_codeset('rpmdragora', 'UTF8');
-our $mageia_release = cat_(
+our $mageia_release = MDK::Common::File::cat_(
-e '/etc/mageia-release' ? '/etc/mageia-release' : '/etc/release'
) || '';
chomp $mageia_release;
@@ -213,7 +214,7 @@ our %config = (
sub readconf() {
${$config{$_}{var}} = $config{$_}{default} foreach keys %config;
- foreach my $l (cat_($configfile)) {
+ foreach my $l (MDK::Common::File::cat_($configfile)) {
foreach (keys %config) {
${$config{$_}{var}} = [ split ' ', $1 ] if $l =~ /^\Q$_\E(.*)/;
}
@@ -230,7 +231,7 @@ sub writeconf() {
# special case:
$no_confirmation->[0] = $::rpmdragora_options{'no-confirmation'};
- output($configfile, map { "$_ " . (ref ${$config{$_}{var}} ? join(' ', @${$config{$_}{var}}) : undef) . "\n" } keys %config);
+ MDK::Common::File::output($configfile, map { "$_ " . (ref ${$config{$_}{var}} ? join(' ', @${$config{$_}{var}}) : undef) . "\n" } keys %config);
}
sub getbanner() {
@@ -533,7 +534,7 @@ my %t2l = (
#- get distrib release number (2006.0, etc)
sub etc_version() {
- (my $v) = split / /, cat_('/etc/version');
+ (my $v) = split / /, MDK::Common::File::cat_('/etc/version');
return $v;
}
@@ -770,9 +771,9 @@ sub mirrors {
},
);
$res or die N("retrieval of [%s] failed", $file) . "\n";
- return $canceled ? () : cat_($file);
+ return $canceled ? () : MDK::Common::File::cat_($file);
});
- my @mirrors = @{ mirror::list(common::parse_LDAP_namespace_structure(cat_('/etc/product.id')), 'distrib') || [] };
+ my @mirrors = @{ mirror::list(common::parse_LDAP_namespace_structure(MDK::Common::File::cat_('/etc/product.id')), 'distrib') || [] };
require timezone;
my $tz = ${timezone::read()}{timezone};
foreach my $mirror (@mirrors) {