diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-08-24 16:14:14 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-08-24 16:14:14 +0000 |
| commit | 44ba14a0d18d9802658a468b97963297cf154344 (patch) | |
| tree | 44c1924ce29a74047415ce014ad7a61aee7dc3e5 | |
| parent | 32c8c1254f461d7776bfc2057f071db450693b02 (diff) | |
| download | rpmdrake-44ba14a0d18d9802658a468b97963297cf154344.tar rpmdrake-44ba14a0d18d9802658a468b97963297cf154344.tar.gz rpmdrake-44ba14a0d18d9802658a468b97963297cf154344.tar.bz2 rpmdrake-44ba14a0d18d9802658a468b97963297cf154344.tar.xz rpmdrake-44ba14a0d18d9802658a468b97963297cf154344.zip | |
rename variable to be distro agnostic
| -rw-r--r-- | Rpmdrake/edit_urpm_sources.pm | 2 | ||||
| -rw-r--r-- | rpmdrake.pm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Rpmdrake/edit_urpm_sources.pm b/Rpmdrake/edit_urpm_sources.pm index a7e83391..4c114327 100644 --- a/Rpmdrake/edit_urpm_sources.pm +++ b/Rpmdrake/edit_urpm_sources.pm @@ -977,7 +977,7 @@ sub mainwindow() { my $license = formatAlaTeX(translate($::license)); $license =~ s/\n/\n\n/sg; # nicer formatting my $w = gtknew('AboutDialog', name => N("Rpmdrake"), - version => $rpmdrake::mdk_version, + version => $rpmdrake::distro_version, copyright => N("Copyright (C) %s by Mandriva", '2002-2008'), license => $license, wrap_license => 1, comments => N("Rpmdrake is Mageia package management tool."), 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}; |