diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-12-18 01:36:55 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-12-18 01:36:55 +0000 |
| commit | 0306e0df3f239e5f4e1ca8da880c76f14f88f549 (patch) | |
| tree | 04a763a1e9ece5aa67cd5adc21fe41fb64715dbe | |
| parent | 1365d1a6c01994b861bcb87996efb35a16a9988d (diff) | |
| download | urpmi-0306e0df3f239e5f4e1ca8da880c76f14f88f549.tar urpmi-0306e0df3f239e5f4e1ca8da880c76f14f88f549.tar.gz urpmi-0306e0df3f239e5f4e1ca8da880c76f14f88f549.tar.bz2 urpmi-0306e0df3f239e5f4e1ca8da880c76f14f88f549.tar.xz urpmi-0306e0df3f239e5f4e1ca8da880c76f14f88f549.zip | |
fix retrieving rpm version with stable rpm
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | urpm/select.pm | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -1,3 +1,6 @@ +- library: + o fix retrieving rpm version with stable rpm + Version 7.15 - 17 December 2012, by Thierry Vignaud - library: diff --git a/urpm/select.pm b/urpm/select.pm index d65c9020..23314753 100644 --- a/urpm/select.pm +++ b/urpm/select.pm @@ -718,7 +718,7 @@ sub translate_why_removed_one { } sub _libdb_version { $_[0] =~ /libdb-(\S+)\.so/ ? version->new("v$1") : () } -sub _rpm_version() { `rpm --version` =~ /version ([0-9.]+)(?:-beta.*)$/ ? version->new("v$1") : () } +sub _rpm_version() { `rpm --version` =~ /version ([0-9.]+)(?:-beta.*)?$/ ? version->new("v$1") : () } sub should_we_migrate_back_rpmdb_db_version { my ($urpm, $state) = @_; |