Fix false positive in non-verbose check for cython's .pyx files

diff --git a/NEWS b/NEWS
index 814d1c77152fb5346838681d6fd7b23846d608a7..fcfcbebd7350729a4fa594f5464f3e1d76031884 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,8 @@ Version 0.XX
   generated pbuilder/sbuild (pbuilder and sbuild provide build dependencies
   but other do not); reported by Christoph Berg and Rafael Laboissière (Debian
   bug #924387).
   generated pbuilder/sbuild (pbuilder and sbuild provide build dependencies
   but other do not); reported by Christoph Berg and Rafael Laboissière (Debian
   bug #924387).

+- Fix false positive in non-verbose check for cython's .pyx files; reported by
+  Picca Frédéric-Emmanuel (Debian Bug #939632).

 
 
 Version 0.09
 
 
 Version 0.09

diff --git a/bin/blhc b/bin/blhc
index a6cb190dea75797765adc38fa1613bc1e27736b2..fba278fde270a625a817e33512a4e6658d5e8aec 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -544,7 +544,7 @@ sub is_non_verbose_build {
     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*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)['"]?\s*(?:\.\.\.)?$/;
+    return 0 if $line =~ /^\s*Compiling \S+\.(?:py|pyx|el)['"]?\s*(?:\.\.\.|because it changed\.)?$/;

     return 0 if $line =~ /^\s*[Cc]ompiling catalog \S+\.po\b/;
     # "Compiling" with no file name.
     if ($line =~ /^\s*[Cc]ompiling\s+(.+?)(?:\.\.\.)?$/) {
     return 0 if $line =~ /^\s*[Cc]ompiling catalog \S+\.po\b/;
     # "Compiling" with no file name.
     if ($line =~ /^\s*[Cc]ompiling\s+(.+?)(?:\.\.\.)?$/) {

diff --git a/t/logs/verbose-build b/t/logs/verbose-build
index 95ce31804778e89fbc82ab3771ecbe967dc461b8..07476f5d468f3c2edec15f18e232ba056891bfe1 100644 (file)
--- a/t/logs/verbose-build
+++ b/t/logs/verbose-build
@@ -179,3 +179,4 @@ cd /build/scribus-1.4.5+dfsg1/obj-x86_64-linux-gnu/scribus/desaxe && /usr/lib/cc
 
 compiling catalog tap/locale/ja/LC_MESSAGES/tappy.po to tap/locale/ja/LC_MESSAGES/tappy.mo
 compiling catalog tap/locale/nl/LC_MESSAGES/tappy.po to tap/locale/nl/LC_MESSAGES/tappy.mo
 
 compiling catalog tap/locale/ja/LC_MESSAGES/tappy.po to tap/locale/ja/LC_MESSAGES/tappy.mo
 compiling catalog tap/locale/nl/LC_MESSAGES/tappy.po to tap/locale/nl/LC_MESSAGES/tappy.mo

+Compiling pyzoltan/core/carray.pyx because it changed.