1
0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-10 06:46:15 +01:00

Open osc 1.0 development

Upcoming changes:
- drop python2 support
- replace M2Crypto with cryptography
- replace cmdln.py/optparse with argparse
- various cleanups
This commit is contained in:
Daniel Mach 2022-07-27 10:10:26 +02:00
parent d8d4b0831c
commit 69f75a0278
2 changed files with 4 additions and 2 deletions

View File

@ -7,7 +7,7 @@ from __future__ import print_function
from .util import git_version from .util import git_version
__version__ = git_version.get_version('0.181.0') __version__ = git_version.get_version('1.0.0~b0')
# __store_version__ is to be incremented when the format of the working copy # __store_version__ is to be incremented when the format of the working copy

View File

@ -69,7 +69,9 @@ def get_version(version):
# remove the 'g' prefix from hash # remove the 'g' prefix from hash
git_hash = git_hash[1:] git_hash = git_hash[1:]
if version and git_tag != version: # removing "~" because it is not an allowed character in git tags
# and also because the normalized form is (for example) 1.0.0b0
if version and git_tag != version.replace("~", ""):
msg = "Git tag '{}' doesn't correspond with version '{}' specified in the source code".format(git_tag, version) msg = "Git tag '{}' doesn't correspond with version '{}' specified in the source code".format(git_tag, version)
raise ValueError(msg) raise ValueError(msg)