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 c7c074c0bc1904b5e2219d0443d99355797e1ac8..4b555a4f9063293114a3ce87aac73b5aa740a113 100644 (file)
--- 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