summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--urpm/select.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 74f6abef..4f2e1268 100644
--- a/NEWS
+++ b/NEWS
@@ -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) = @_;