aboutsummaryrefslogtreecommitdiffstats
path: root/rpmdrake.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-08-24 16:14:14 +0000
committerThierry Vignaud <tv@mageia.org>2012-08-24 16:14:14 +0000
commit44ba14a0d18d9802658a468b97963297cf154344 (patch)
tree44c1924ce29a74047415ce014ad7a61aee7dc3e5 /rpmdrake.pm
parent32c8c1254f461d7776bfc2057f071db450693b02 (diff)
downloadrpmdrake-44ba14a0d18d9802658a468b97963297cf154344.tar
rpmdrake-44ba14a0d18d9802658a468b97963297cf154344.tar.gz
rpmdrake-44ba14a0d18d9802658a468b97963297cf154344.tar.bz2
rpmdrake-44ba14a0d18d9802658a468b97963297cf154344.tar.xz
rpmdrake-44ba14a0d18d9802658a468b97963297cf154344.zip
rename variable to be distro agnostic
Diffstat (limited to 'rpmdrake.pm')
-rw-r--r--rpmdrake.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/rpmdrake.pm b/rpmdrake.pm
index bcea0740..1432869f 100644
--- a/rpmdrake.pm
+++ b/rpmdrake.pm
@@ -114,7 +114,7 @@ our $mandrake_release = cat_(
-e '/etc/mandrakelinux-release' ? '/etc/mandrakelinux-release' : '/etc/release'
) || '';
chomp $mandrake_release;
-our ($mdk_version) = $mandrake_release =~ /(\d+\.\d+)/;
+our ($distro_version) = $mandrake_release =~ /(\d+\.\d+)/;
our ($branded, %distrib);
$branded = -f '/etc/sysconfig/oem'
and %distrib = MDK::Common::System::distrib();
@@ -937,7 +937,7 @@ sub add_medium_and_check {
sub check_update_media_version {
my $urpm = shift;
foreach (@_) {
- if ($_->{name} =~ /(\d+\.\d+).*\bftp\du\b/ && $1 ne $mdk_version) {
+ if ($_->{name} =~ /(\d+\.\d+).*\bftp\du\b/ && $1 ne $distro_version) {
interactive_msg(
N("Warning"),
$branded
@@ -946,7 +946,7 @@ It will be disabled.",
$_->{name}, $distrib{system}, $distrib{product})
: N("Your medium `%s', used for updates, does not match the version of Mageia you're running (%s).
It will be disabled.",
- $_->{name}, $mdk_version)
+ $_->{name}, $distro_version)
);
$_->{ignore} = 1;
urpm::media::write_config($urpm) if -w $urpm->{config};