aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-07-25 17:02:07 +0000
committerThierry Vignaud <tv@mageia.org>2012-07-25 17:02:07 +0000
commit24110a7693b1d1f2144e3c282a5f1ca329fc244d (patch)
tree693fc398f1a8ec0ec53b3a2b6b286e22e441cf0a
parent5fb6b8fee487f9b017f13d8589745ca668eaedab (diff)
downloadrpm-setup-24110a7693b1d1f2144e3c282a5f1ca329fc244d.tar
rpm-setup-24110a7693b1d1f2144e3c282a5f1ca329fc244d.tar.gz
rpm-setup-24110a7693b1d1f2144e3c282a5f1ca329fc244d.tar.bz2
rpm-setup-24110a7693b1d1f2144e3c282a5f1ca329fc244d.tar.xz
rpm-setup-24110a7693b1d1f2144e3c282a5f1ca329fc244d.zip
sync with upstream rpm.org: "Avoid emitting empty perl() module deps.
Test case from DOM.pm (perl-CSS-DOM 0.13): use # to keep CPANTS happy :-) strict; use # same here warnings;" (Ville Skyttä , 2011-02-12)
-rw-r--r--NEWS1
-rwxr-xr-xperl.req2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 0679ccd..29cd47f 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@
any need for it, reducing ~8K packages' dependency on it during next rebuild.
(Per Oyvind, mdv)
- perl.prov: sync with upstream rpm.org:
+ o avoid emitting empty perl() module deps
o filter out incorrect perl(main) provides (rh#177960)
o fix perl version provide for packages defined in multiple blocks (#rhbz214496)
o make perl.{req,prov} warn about unreadable files
diff --git a/perl.req b/perl.req
index 1b44ae1..fcba2fc 100755
--- a/perl.req
+++ b/perl.req
@@ -136,7 +136,7 @@ sub process_file {
(m/^(\s*) # we hope the inclusion starts the line
(require|use)\s+(?!\{) # do not want 'do {' loops
# quotes around name are always legal
- [\'\"]?([^\;\ \'\"\t]*)[\'\"]?[\t\;\ ]
+ [\'\"]?([^\;\ \'\"\t]+)[\'\"]?[\t\;\ ]
# the syntax for 'use' allows version requirements
\s*([.0-9]*)
/x)