From cea77cce0fbf2d2aa835b51172de886c1a49129d Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Fri, 27 Jan 2012 16:15:03 +0100 Subject: [PATCH] the first seven chars should be enough --- debian_build.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 -- 2.39.5