[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.3-25-g1ac6834



The following commit has been merged in the master branch:
commit 1ac68341f49bbdc8181a47cada83ce895200c9c5
Author: Jakub Wilk <jwilk@debian.org>
Date:   Sat Sep 24 22:36:18 2011 +0200

    t/runtests: Pass --auto-commit to dpkg-source
    
    dpkg (>= 1.16.1) no longer auto creates patches, except if
    --auto-commit is passed.  At least one test is known to rely on this.
    
    Acked-by: Niels Thykier <niels@thykier.net>

diff --git a/t/runtests b/t/runtests
index 133cf38..0dc9ed6 100755
--- a/t/runtests
+++ b/t/runtests
@@ -67,6 +67,11 @@ our $LINTIAN_ROOT = $ENV{'LINTIAN_ROOT'};
 our $LINTIAN = $LINTIAN_ROOT . '/frontend/lintian';
 our $DPKG_BUILDPACKAGE = 'dpkg-buildpackage -rfakeroot -us -uc -d'
     . ' -iNEVER_MATCH_ANYTHING -INEVER_MATCH_ANYTHING';
+if (`dpkg-source --help` =~ m,\s--commit\s,) {
+    # dpkg (>= 1.16.1) doesn't automatically create patches anymore, unless
+    # explicitly asked to do so:
+    $DPKG_BUILDPACKAGE .= ' --source-option=--auto-commit';
+}
 our $STANDARDS_VERSION = '3.9.2';
 our $ARCHITECTURE = `dpkg-architecture -qDEB_HOST_ARCH`;
 chomp $ARCHITECTURE;

-- 
Debian package checker


Reply to: