Fix false positive when "compiling" python files.

Also handle .el files.

Fixes Debian bug #714630, reported by Matthias Klose. Thanks.

diff --git a/NEWS b/NEWS
index 3e3d2555ea450931bf5ca888aba641eb04ac8cc9..1440b0c7517f8036d9e74674d095d2b4d87ea54c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@ Version 0.XX
   reported by Nicolas Boulenguez.
 - Fix buildd architecture detection. Only relevant if the chroot setup fails
   and dpkg-buildpackage is never run; therefore a minor issue.
   reported by Nicolas Boulenguez.
 - Fix buildd architecture detection. Only relevant if the chroot setup fails
   and dpkg-buildpackage is never run; therefore a minor issue.

+- Fix false positive when "compiling" python files (Debian bug #714630),
+  reported by Matthias Klose.

 
 - Sync architecture specific hardening support with dpkg 1.17.1.
 
 
 - Sync architecture specific hardening support with dpkg 1.17.1.
 

diff --git a/bin/blhc b/bin/blhc
index c77a16cedddc3c91333098f9a96a4104abdaae6a..2bf99cc6145e6ca40459a253fab32103ba9afd0f 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -442,6 +442,8 @@ sub is_non_verbose_build {
     # C++ compiler setting.
     return 0 if $line =~ /^\s*C\+\+.+?:\s+(?:yes|no)\s*$/;
     return 0 if $line =~ /^\s*C\+\+ Library: stdc\+\+$/;
     # C++ compiler setting.
     return 0 if $line =~ /^\s*C\+\+.+?:\s+(?:yes|no)\s*$/;
     return 0 if $line =~ /^\s*C\+\+ Library: stdc\+\+$/;

+    # "Compiling" non binary files.
+    return 0 if $line =~ /^\s*Compiling \S+\.(?:py|el)['"]?(?:\.\.\.)?$/;

     # "Compiling" with no file name.
     if ($line =~ /^\s*[Cc]ompiling\s+(.+?)(?:\.\.\.)?$/) {
         # $file_extension_regex may need spaces around the filename.
     # "Compiling" with no file name.
     if ($line =~ /^\s*[Cc]ompiling\s+(.+?)(?:\.\.\.)?$/) {
         # $file_extension_regex may need spaces around the filename.

diff --git a/t/logs/verbose-build b/t/logs/verbose-build
index 7839fb9a9f41c82c4bbefa99039f99dff04ff7e4..050596fda24116f2a231639118b34fcded956908 100644 (file)
--- a/t/logs/verbose-build
+++ b/t/logs/verbose-build
@@ -98,3 +98,5 @@ Compiling Test sources
 Compiling with GCC now generates lots of new warnings.
 Compiling outside source directory - copying needed files
 Compiling the test favour in /build/buildd-test_42.47-11-amd64/test-42.47/debian/tmp-test
 Compiling with GCC now generates lots of new warnings.
 Compiling outside source directory - copying needed files
 Compiling the test favour in /build/buildd-test_42.47-11-amd64/test-42.47/debian/tmp-test

+Compiling /«BUILDDIR»/emacs23-23.4+1/debian/build-x/src/../lisp/international/characters.el
+Compiling '/«PKGBUILDDIR»/debian/tmp/usr/lib/python3.3/_markupbase.py'...