From 3b7900c8dff2c5329d86fe18061d13ec625c382a Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Thu, 12 Dec 2013 16:44:02 +0100 Subject: [PATCH] Revert "lib/git_buildpackage.py: Fix build failure caused by calling clean target." This change was not enough, because pdebuild calls the clean target to a chain. See http://redmine.pb.local/issues/2744 for details. This reverts commit 681239fe03ab6f2f4f91f35368199ad9e7dd4880. --- lib/git_buildpackage.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/git_buildpackage.py b/lib/git_buildpackage.py index 4b555a4..c7c074c 100644 --- a/lib/git_buildpackage.py +++ b/lib/git_buildpackage.py @@ -46,18 +46,12 @@ 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 -- 2.39.5