From: Holger Levsen <holger@layer-acht.org>
Date: Thu, 8 Mar 2012 13:14:35 +0000 (+0100)
Subject: dont delete existing gbp.conf in repos+branches
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=4662e4303d79740d802952896a3b9f841212bccf;p=profitbricks%2Fjenkins-build-scripts.git

dont delete existing gbp.conf in repos+branches
---

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(