From 6a266054ba6327a2b19fe1462cdbcfbb13f3b403 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Wed, 14 Aug 2013 18:20:22 +0200 Subject: [PATCH] Fix false positive when "compiling" python files. Also handle .el files. Fixes Debian bug #714630, reported by Matthias Klose. Thanks. --- NEWS | 2 ++ bin/blhc | 2 ++ t/logs/verbose-build | 2 ++ 3 files changed, 6 insertions(+) diff --git a/NEWS b/NEWS index 3e3d255..1440b0c 100644 --- 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. +- Fix false positive when "compiling" python files (Debian bug #714630), + reported by Matthias Klose. - Sync architecture specific hardening support with dpkg 1.17.1. diff --git a/bin/blhc b/bin/blhc index c77a16c..2bf99cc 100755 --- 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\+\+$/; + # "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. diff --git a/t/logs/verbose-build b/t/logs/verbose-build index 7839fb9..050596f 100644 --- 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 /«BUILDDIR»/emacs23-23.4+1/debian/build-x/src/../lisp/international/characters.el +Compiling '/«PKGBUILDDIR»/debian/tmp/usr/lib/python3.3/_markupbase.py'... -- 2.43.2