From: Benjamin Drung <benjamin.drung@profitbricks.com>
Date: Mon, 9 Dec 2013 08:28:52 +0000 (+0100)
Subject: lib/git_buildpackage.py: Fix build failure caused by calling clean target.
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=681239fe03ab6f2f4f91f35368199ad9e7dd4880;p=profitbricks%2Fjenkins-build-scripts.git

lib/git_buildpackage.py: Fix build failure caused by calling clean target.

We do want to let dpkg-buildpackage call the clean target, because
it can fail if we do not have all build dependencies installed.
Instead we make sure that the git checkout is clean and the clean
target will be called inside the pbuilder chroot (after the
installation of the build dependencies).
---

diff --git a/lib/git_buildpackage.py b/lib/git_buildpackage.py
index c7c074c..4b555a4 100644
--- a/lib/git_buildpackage.py
+++ b/lib/git_buildpackage.py
@@ -46,12 +46,18 @@ class GitBuildPackage(object):
         '''
         TODO
         '''
+        # We do want to let dpkg-buildpackage call the clean target, because
+        # it can fail if we do not have all build dependencies installed.
+        # Instead we make sure that the git checkout is clean and the clean
+        # target will be called inside the pbuilder chroot (after the
+        # installation of the build dependencies)
         result = [
                 BIN_SUDO,
                 BIN_GIT_BUILDPACKAGE,
                 '--git-upstream-branch=%s' %(self.upstream_branch),
                 '--git-debian-branch=%s' %(self.debian_branch),
                 '--git-ignore-new',
+                '--git-cleaner=/bin/true',
                 '--debbuildopts', '-b'    # don't build source packages... see directly below
         ]
         return result