From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 27 Jan 2012 15:15:03 +0000 (+0100)
Subject: the first seven chars should be enough
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=cea77cce0fbf2d2aa835b51172de886c1a49129d;p=profitbricks%2Fjenkins-build-scripts.git

the first seven chars should be enough
---

diff --git a/debian_build.py b/debian_build.py
index 211d143..8a819b8 100755
--- a/debian_build.py
+++ b/debian_build.py
@@ -355,13 +355,13 @@ if __name__ == '__main__':
 	current_commit = git_helper.git_get_commit_id()
 
         if GIT_BRANCH_NAME.startswith('release/') or GIT_BRANCH_NAME.startswith('hotfix/'):
-            version = '%s~rc%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit)
+            version = '%s~rc%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit[0:7])
         elif GIT_BRANCH_NAME.startswith('feature/') or GIT_BRANCH_NAME.startswith('poc/') or GIT_BRANCH_NAME.startswith('bugfix/')  or options.distribution == 'experimental':
-            version = '%s~experimental%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit)
+            version = '%s~experimental%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit[0:7])
             # these uploads should go to a different repo:
             DPUT_OPTIONS = DPUT_OPTIONS_DEV
         else:
-            version = '%s~develop%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit)
+            version = '%s~develop%s+%s+%s' %(version, daily_date, BUILD_NUMBER, current_commit[0:7])
 
         new_log = 'Generated by jenkins build of %s' % current_commit