[Reproducible-commits] [dpkg] 36/61: dpkg-shlibdeps: Move regex variable inside function

Jérémy Bobbio lunar at moszumanska.debian.org
Mon Sep 21 09:57:18 UTC 2015


This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit ae83a2d9838e3f6a4cfc4b49a94681537147142b
Author: Guillem Jover <guillem at debian.org>
Date:   Tue Sep 15 23:21:26 2015 +0200

    dpkg-shlibdeps: Move regex variable inside function
    
    The function is defined after its first call site, so the regex variable
    is not found when compiling the code.
---
 scripts/dpkg-shlibdeps.pl | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index c8b2336..8c83025 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -670,20 +670,21 @@ sub split_soname {
     }
 }
 
-my $shlibs_re = qr{
-    ^\s*
-    (?:(\S+):\s+)?              # Optional type
-    (\S+)\s+                    # Library
-    (\S+)                       # Version
-    (?:
-      \s+
-      (\S.*\S)                  # Dependencies
-    )?
-    \s*$
-}x;
-
 sub extract_from_shlibs {
     my ($soname, $shlibfile) = @_;
+
+    my $shlibs_re = qr{
+        ^\s*
+        (?:(\S+):\s+)?              # Optional type
+        (\S+)\s+                    # Library
+        (\S+)                       # Version
+        (?:
+          \s+
+          (\S.*\S)                  # Dependencies
+        )?
+        \s*$
+    }x;
+
     # Split soname in name/version
     my ($libname, $libversion) = split_soname($soname);
     unless (defined $libname) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git



More information about the Reproducible-commits mailing list