diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-09-20 21:04:05 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-09-20 21:04:05 +0000 |
| commit | caf468c7a499790da9108c416b00e75323c8ee28 (patch) | |
| tree | 1c210f21c135e134a17d31a474dee3161f78c5fd | |
| parent | b83d5e6d041c4ba6c2649ec017ee77019db4ba77 (diff) | |
| download | rpmdrake-caf468c7a499790da9108c416b00e75323c8ee28.tar rpmdrake-caf468c7a499790da9108c416b00e75323c8ee28.tar.gz rpmdrake-caf468c7a499790da9108c416b00e75323c8ee28.tar.bz2 rpmdrake-caf468c7a499790da9108c416b00e75323c8ee28.tar.xz rpmdrake-caf468c7a499790da9108c416b00e75323c8ee28.zip | |
(version_release) rename it as evr()
rationale: it is really what it is after previous commit
| -rw-r--r-- | Rpmdrake/formatting.pm | 4 | ||||
| -rw-r--r-- | Rpmdrake/gui.pm | 2 | ||||
| -rw-r--r-- | Rpmdrake/pkg.pm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Rpmdrake/formatting.pm b/Rpmdrake/formatting.pm index f5cc928d..644c4ad8 100644 --- a/Rpmdrake/formatting.pm +++ b/Rpmdrake/formatting.pm @@ -36,6 +36,7 @@ our @ISA = qw(Exporter); our @EXPORT = qw( $spacing ensure_utf8 + evr format_changelog_changelogs format_changelog_string format_field @@ -50,7 +51,6 @@ our @EXPORT = qw( rpm_description split_fullname urpm_name - version_release ); @@ -92,7 +92,7 @@ sub my_fullname { "$name-$version-$release"; } -sub version_release { +sub evr { my ($pkg) = @_; my (undef, $version, $release) = $pkg->fullname; my $epoch = $pkg->epoch; diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm index 98ff706f..f103fffa 100644 --- a/Rpmdrake/gui.pm +++ b/Rpmdrake/gui.pm @@ -207,7 +207,7 @@ sub get_details { my ($pkg, $upkg, $installed_version, $raw_medium) = @_; my $a = ugtk2::markup_to_TextView_format( $spacing . join("\n$spacing", - format_field(N("Version: ")) . version_release($upkg), + format_field(N("Version: ")) . evr($upkg), ($upkg->flag_installed ? format_field(N("Currently installed version: ")) . $installed_version : () ), diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index 9b76baea..12ab3452 100644 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -192,7 +192,7 @@ sub extract_header { sub find_installed_version { my ($p) = @_; my $version; - open_rpm_db()->traverse_tag_find('name', $p->name, sub { $version = version_release($_[0]) }); + open_rpm_db()->traverse_tag_find('name', $p->name, sub { $version = evr($_[0]) }); $version || N("(none)"); } |