Bug#887727: [debhelper-devel] Bug#887727: debhelper, dh-dist-zilla: dh-dist-zilla based package builds no more run dh_auto_install (and maybe other dh_auto_*)

2018-01-21 Thread Sascha Steinbiss
Hi Niels and Axel,

> Niels Thykier wrote:
>> Could you please verify that the attached patch fixes the problem for you?
> 
> systray-mdstat and roary both build fine again with this patch applied
> on top of debhelper's git HEAD.

Confirmed, and new roary upload done [x].
Thanks to you both for the quick action!

Best regards
Sascha


signature.asc
Description: Message signed with OpenPGP


Bug#887727: [debhelper-devel] Bug#887727: debhelper, dh-dist-zilla: dh-dist-zilla based package builds no more run dh_auto_install (and maybe other dh_auto_*)

2018-01-20 Thread Axel Beckert
Control: tag -1 - moreinfo

Hi Niels,

thanks for coming up with a patch so quickly!

Niels Thykier wrote:
> Could you please verify that the attached patch fixes the problem for you?

systray-mdstat and roary both build fine again with this patch applied
on top of debhelper's git HEAD.

Since 10.10.6 to 11.1.2 is rather big range of releases which saw
several uploads to backports as well as an Ubuntu release I intent to
update dh-dist-zilla's  debhelper dependency to << 10.10.6~ and >=
11.1.3~.

Regards, Axel
-- 
 ,''`.  |  Axel Beckert , https://people.debian.org/~abe/
: :' :  |  Debian Developer, ftp.ch.debian.org Admin
`. `'   |  4096R: 2517 B724 C5F6 CA99 5329  6E61 2FF9 CD59 6126 16B5
  `-|  1024D: F067 EA27 26B9 C3FC 1486  202E C09E 1D89 9593 0EDE


signature.asc
Description: Digital signature


Bug#887727: [debhelper-devel] Bug#887727: debhelper, dh-dist-zilla: dh-dist-zilla based package builds no more run dh_auto_install (and maybe other dh_auto_*)

2018-01-20 Thread Niels Thykier
Control: tags -1 patch moreinfo

Axel Beckert:
> Package: debhelper,dh-dist-zilla
> Version: debhelper/10.10.6
> Severity: serious
> Tags: sid buster
> Control: affects -1 src:roary src:systray-mdstat
> 
> Hi,
> 
> Sascha Steinbiss  (X-Debbugs-Cc'ed) made me aware
> that at least two dh-dist-zilla based source packages (roary and
> systray-mdstat) produce more or less empty packages when build now
> (but don't FTBFS and in case of systray-mdstat not even throw a single
> lintian warning).
> 
> An DH_VERBOSE=1 build log reveals that dh_auto_install is no more
> called in the build. (This probably also counts for other dh_auto_*
> scripts.) This smells a lot like being caused by this change in
> debhelper/10.10.6 (uploaded November 2017, i.e. shortly after the
> latest uploads of the two mentioned packages):
> 
>   * dh,dh_auto_*: Support skipping all of the dh_auto_* helpers if the
> package does not seem to have a build system (and there are no
> build system related options passed to dh).
> 
> Which is this commit:
> https://anonscm.debian.org/git/debhelper/debhelper.git/commit/?id=52bf7ef7
> 
> Reverting this commit fixes the issue as dh_auto_install is called
> again.
> 
> So I now wonder:
> 
> * Is this a bug in debhelper? I.e. does the new (additional?)
>   buildsystem detection not work properly?
> 
> * Or is this a bug in dh-dist-zilla and it should have declared
>   something in
>   /usr/share/perl5/Debian/Debhelper/Sequence/dist_zilla.pm
>   which wasn't relevant yet, but is now?
> 
>   Regards, Axel
> 

Hi Axel and Sascha,

Thanks for reporting the bug.

Could you please verify that the attached patch fixes the problem for you?

Thanks,
~Niels
>From 903a802b449d840cbf43eb3ffd3147e433bfaa1b Mon Sep 17 00:00:00 2001
From: Niels Thykier 
Date: Sat, 20 Jan 2018 09:38:35 +
Subject: [PATCH] dh: Always run commands with sequence defined options

Signed-off-by: Niels Thykier 
---
 dh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dh b/dh
index 47160317..787462aa 100755
--- a/dh
+++ b/dh
@@ -998,6 +998,9 @@ sub can_skip {
 	return 0 if $user_specified_options ||
 		(exists $ENV{DH_OPTIONS} && length $ENV{DH_OPTIONS});
 
+	return 0 if exists($command_opts{$command})
+		and @{$command_opts{$command}};
+
 	if (! defined $skipinfo{$command}) {
 		$skipinfo{$command}=[extract_skipinfo($command)];
 	}
-- 
2.15.1