aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-07-25 17:01:54 +0000
committerThierry Vignaud <tv@mageia.org>2012-07-25 17:01:54 +0000
commit9a1f83757ac982797a35f824fbada528f3d284bd (patch)
tree43e34286c391552f22a2b00dc2577ec4d1c40d26
parent6ca6d0c8e14c816485b954f2c636b8ea9500ec1b (diff)
downloadrpm-setup-9a1f83757ac982797a35f824fbada528f3d284bd.tar
rpm-setup-9a1f83757ac982797a35f824fbada528f3d284bd.tar.gz
rpm-setup-9a1f83757ac982797a35f824fbada528f3d284bd.tar.bz2
rpm-setup-9a1f83757ac982797a35f824fbada528f3d284bd.tar.xz
rpm-setup-9a1f83757ac982797a35f824fbada528f3d284bd.zip
sync with upstream rpm.org: "Remove unneeded regex grouping"
(Ville Skyttä, 2011-04-24)
-rw-r--r--NEWS1
-rwxr-xr-xperl.prov4
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 8ac85f5..f073d91 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
by glibc for five years now and can safely be assumed that there's no longer
any need for it, reducing ~8K packages' dependency on it during next rebuild.
(Per Oyvind, mdv)
+- perl.prov: sync with upstream rpm.org
- use upstream fonconfig.prov as we had exactly the same file
Version 1.147-12 - 24 Jul 2012, by Colin
diff --git a/perl.prov b/perl.prov
index 3b4c795..82206b8 100755
--- a/perl.prov
+++ b/perl.prov
@@ -157,8 +157,8 @@ sub process_file {
# '$Revision' this often causes bizzare strings and is the most
# common method of non static numbering.
- if (m/(\$Revision: (\d+[.0-9]+))/) {
- $version= $2;
+ if (m/\$Revision: (\d+[.0-9]+)/) {
+ $version= $1;
} elsif (m/VERSION.*?[\'\"]?(\d+[._0-9]+)[\'\"]?/) {
# look for a static number hard coded in the script