From siretart@tauware.de Tue Apr 16 06:16:20 2013 Received: (at 626361) by bugs.debian.org; 16 Apr 2013 06:16:20 +0000 X-Spam-Checker-Version: SpamAssassin 3.3.2-bugs.debian.org_2005_01_02 (2011-06-06) on buxtehude.debian.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=4.0 tests=BAYES_00,DIGITS_LETTERS, MURPHY_DRUGS_REL8,RCVD_IN_DNSWL_MED autolearn=no version=3.3.2-bugs.debian.org_2005_01_02 X-Spam-Bayes: score:0.0000 Tokens: new, 26; hammy, 149; neutral, 47; spammy, 2. spammytokens:0.997-1--H*RU:sk:sandy.t, 0.997-1--H*r:sk:sandy.t hammytokens:0.000-+--lintian, 0.000-+--100644, 0.000-+--chroots, 0.000-+--chroot, 0.000-+--1.7.10.4 Return-path: Received: from faui45.informatik.uni-erlangen.de ([131.188.34.45]) by buxtehude.debian.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1URzBk-0008NR-7S for 626361@bugs.debian.org; Tue, 16 Apr 2013 06:16:20 +0000 Received: from vamos2c.informatik.uni-erlangen.de (vamos2c.informatik.uni-erlangen.de [IPv6:2001:638:a000:4142::ffff:15]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by faui45.informatik.uni-erlangen.de (Postfix) with ESMTPS id AD231743D4C for <626361@bugs.debian.org>; Tue, 16 Apr 2013 08:07:34 +0200 (CEST) Received: from ppp-88-217-59-181.dynamic.mnet-online.de ([88.217.59.181] helo=sandy) by vamos2c.informatik.uni-erlangen.de with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1URz3D-0006AD-ES; Tue, 16 Apr 2013 08:07:33 +0200 Received: from sandy.tauware.de ([192.168.129.99] helo=unstable-devel) by sandy with esmtp (Exim 4.76) (envelope-from ) id 1URz3C-0000w5-EB; Tue, 16 Apr 2013 08:07:30 +0200 Received: from siretart by unstable-devel with local (Exim 4.80) (envelope-from ) id 1URz3C-0001xw-FL; Tue, 16 Apr 2013 08:07:30 +0200 From: Reinhard Tartler To: 626361@bugs.debian.org Cc: Reinhard Tartler Subject: [PATCH] sbuild: Run lintian from within the chroot Date: Tue, 16 Apr 2013 08:07:26 +0200 Message-Id: <1366092446-7522-1-git-send-email-siretart@tauware.de> X-Mailer: git-send-email 1.7.10.4 X-Virus-Scanned: clamav-milter 0.97.7 at faui45 X-Virus-Status: Clean X-Greylist: delayed 522 seconds by postgrey-1.34 at buxtehude; Tue, 16 Apr 2013 06:16:20 UTC Run lintian from inside the chroot to support use-cases with several chroots (oldstable, unstable, testing, lucid, natty, etc), where using the system lintian might not give the best results. By using the lintian version from the chroot, sbuild uses always the version that matches the distrobersion that the package is being built for. Closes: #626361 --- lib/Sbuild/Build.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) Hi Roger, I have rebased the patch to current master, as some changes in the dependency resolver broke it. Please find an updated version of my patch in form of a git-commit send on behalf by 'git send-email'. Are there any remaining blockers for applying it to the master branch? Cheers, Reinhard diff --git a/lib/Sbuild/Build.pm b/lib/Sbuild/Build.pm index ee3e7e1..aef3d38 100644 --- a/lib/Sbuild/Build.pm +++ b/lib/Sbuild/Build.pm @@ -1118,12 +1118,16 @@ sub run_lintian { $self->log_subsubsection("lintian"); + my $resolver = $self->get('Dependency Resolver'); my $lintian = $self->get_conf('LINTIAN'); my @lintian_command = ($lintian); push @lintian_command, @{$self->get_conf('LINTIAN_OPTIONS')} if ($self->get_conf('LINTIAN_OPTIONS')); push @lintian_command, $self->get('Changes File'); - $self->get('Host')->run_command( + $resolver->add_dependencies('LINTIAN', 'lintian', "", "", "", "", ""); + return 1 unless $resolver->install_core_deps('lintian', 'LINTIAN'); + + $self->get('Session')->run_command( { COMMAND => \@lintian_command, PRIORITY => 0, }); -- 1.7.10.4