From 05af71dd082e29fdadbdbcab43e024b8305a16d9 Mon Sep 17 00:00:00 2001 From: ZhuoX Li Date: Wed, 12 Nov 2014 18:08:44 +0800 Subject: [PATCH] Fix duplicate prefix on package version. Duplicate prefix on package version on prerelease project. Eg: The error prefix: Modello-Homescreen-0.0.2-20141111.000000.20141111.20141111.000000.1.1.noarch.rpm We should create the prefix, like this: Modello-Homescreen-0.0.2-20141111.000000.1.1.noarch.rpm Fixes: #2218 Change-Id: Ie9d552628eefd799a4983c40b137585fba66cb40 --- job_submit.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/job_submit.py b/job_submit.py index c949e5d..d1909ea 100755 --- a/job_submit.py +++ b/job_submit.py @@ -63,10 +63,11 @@ def change_release_name(build, project, git_tag): release_name = 'Release: %s' % (git_tag.split('/')[-1]) res = re.findall(r'^Release: ?\S+$', config, flags=re.MULTILINE) if res: - note = '#Insert time from submission into release name\n' - release_name = '%s.%s' % (release_name, - res[0].split('Release:')[1].strip()) - config = config.replace(res[0], '%s%s' % (note, release_name), 1) + if git_tag.split('/')[-1] not in res[0]: + note = '#Insert time from submission into release name\n' + release_name = '%s.%s' % (release_name, + res[0].split('Release:')[1].strip()) + config = config.replace(res[0], '%s%s' % (note, release_name), 1) else: note = '#Add release name into prjconf\n' config = note + '%s\n' % release_name + config -- 2.7.4