[Rpm-maint] [PATCH] perl.{prov,req} improvments

Thierry Vignaud thierry.vignaud at gmail.com
Mon Sep 15 15:01:01 UTC 2014


Hi

Mageia just switched to internal deps generator (at least).
In the process, I unforked as most scripts as possible.
Here's some old fixes:

skip-plain-regular-comments.diff:
just skip plain, regular perl comments...

support-for-_-in-perl-module-version.diff:
support for _ in perl module version
-------------- next part --------------
commit 2af13ef2dccbe7c3dc88b4f2b5a5329f0e135a99
Author: Jérôme Quelin <jquelin at mandriva.org>
Date:   Fri Mar 12 17:22:23 2010 +0000

    skip plain, regular comments. how comes this has not been spotted earlier? (sigh)

diff --git a/scripts/perl.prov b/scripts/perl.prov
index 8f5d53b..3113cb2 100755
--- a/scripts/perl.prov
+++ b/scripts/perl.prov
@@ -117,7 +117,7 @@ sub process_file {
       $inover = 0;
     }
 
-    if ($incomment || $inover) {
+    if ($incomment || $inover || m/^\s*#/) {
        next;
     }
 
-------------- next part --------------
commit 0f1dd7bebbea6916dc5d698099a8a4cbfb829e81
Author: Jerome Quelin <jquelin at mageia.org>
Date:   Sat Feb 26 12:04:53 2011 +0000

    1.118 - support for _ in perl module version

diff --git a/scripts/perl.prov b/scripts/perl.prov
index a6d68bb..85b8e81 100755
--- a/scripts/perl.prov
+++ b/scripts/perl.prov
@@ -171,7 +171,7 @@ sub process_file {
 
       if (m/\$Revision: (\d+[.0-9]+)/) {
         $version = $1;
-      } elsif (m/['"]?(\d+[.0-9]+)['"]?/) {
+      } elsif (m/['"]?(\d+[._0-9]+)['"]?/) {
 
         # look for a static number hard coded in the script
 


More information about the Rpm-maint mailing list