]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
dont delete existing gbp.conf in repos+branches
authorHolger Levsen <holger@layer-acht.org>
Thu, 8 Mar 2012 13:14:35 +0000 (14:14 +0100)
committerHolger Levsen <holger@layer-acht.org>
Thu, 8 Mar 2012 13:14:35 +0000 (14:14 +0100)
debian_build.py

index 601d9b37ff4dc999f76c4ebb16e7ea6de1758a4a..07763030f086fa47d90d38a82265953d7514d1d7 100755 (executable)
@@ -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(