@@ -77,7 +77,6 @@ def parse_templates(templates, repo, next_custom, promote):
77
77
else :
78
78
suffix = cfg ['next_suffix' ]
79
79
80
- # this should NEVER fail
81
80
has_user_string = (promote or in_next ) and not next_custom is None
82
81
if has_user_string :
83
82
user = user_numbers_from_string (next_custom )
@@ -88,8 +87,8 @@ def parse_templates(templates, repo, next_custom, promote):
88
87
89
88
keywords = {
90
89
'CURRENT_VERSION' : vstring ,
91
- 'BUILD_ID' : repo ['build-id' ],
92
- 'FULL_BUILD_ID' : repo ['full-build-id' ],
90
+ 'BUILD_ID' : repo ['build-id' ] if not promote else '' ,
91
+ 'FULL_BUILD_ID' : repo ['full-build-id' ] if not promote else '' ,
93
92
'MAJOR' : repo ['maj' ] if not has_user_string else int (user [0 ]),
94
93
'MINOR' : repo ['min' ] if not has_user_string else int (user [1 ]),
95
94
'PATCH' : repo ['patch' ] if not has_user_string else int (user [2 ]),
@@ -131,11 +130,11 @@ def user_numbers_from_string(user):
131
130
def build_version_string (repo , promote = False , next_custom = None ):
132
131
in_next = repo ['count' ] > 0
133
132
has_next_custom = not next_custom is None and len (next_custom ) > 0
133
+
134
134
if promote :
135
135
if has_next_custom :
136
136
# simulates next real version after proper tagging
137
137
version = next_custom
138
- version += "/" + repo ['build-id' ]
139
138
return version
140
139
else :
141
140
return ''
0 commit comments