From 4662e4303d79740d802952896a3b9f841212bccf Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 8 Mar 2012 14:14:35 +0100 Subject: [PATCH] dont delete existing gbp.conf in repos+branches --- debian_build.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/debian_build.py b/debian_build.py index 601d9b3..0776303 100755 --- a/debian_build.py +++ b/debian_build.py @@ -267,14 +267,14 @@ if __name__ == '__main__': # we need to make sure our jenkins config is used, so let's delete any # other config available in repository that might be prefered - cleanup_files = ('.gbp.conf', 'debian/gbp.conf', '.git/gbp.conf') - result = git_helper.git_cleanup_branch(cleanup_files) - commit_files = result["goods"].keys() - if len(commit_files) > 0: - git_helper.git_commit( - "Cleanup branch for correct builds.", - commit_files - ) + #cleanup_files = ('.gbp.conf', 'debian/gbp.conf', '.git/gbp.conf') + #result = git_helper.git_cleanup_branch(cleanup_files) + #commit_files = result["goods"].keys() + #if len(commit_files) > 0: + # git_helper.git_commit( + # "Cleanup branch for correct builds.", + # commit_files + # ) cmd = ['dpkg-parsechangelog'] parse_changelog = subprocess.Popen( -- 2.39.5