diff options
author | Martin Liska <mliska@suse.cz> | 2021-04-09 11:35:09 +0200 |
---|---|---|
committer | Martin Liska <mliska@suse.cz> | 2021-04-09 11:35:09 +0200 |
commit | a7ce23cec4a4a581b88c226418dc702dcd19bceb (patch) | |
tree | b6a4c01d1b4c69f9e9a5297254f58940824d0283 /maintainer-scripts | |
parent | 34bf325000d03472700af410f3840ac222add81d (diff) | |
download | gcc-a7ce23cec4a4a581b88c226418dc702dcd19bceb.zip gcc-a7ce23cec4a4a581b88c226418dc702dcd19bceb.tar.gz gcc-a7ce23cec4a4a581b88c226418dc702dcd19bceb.tar.bz2 |
branch_changer: fix usage of Version class.
maintainer-scripts/ChangeLog:
* branch_changer.py: Fix usage of Version class.
Diffstat (limited to 'maintainer-scripts')
-rwxr-xr-x | maintainer-scripts/branch_changer.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/maintainer-scripts/branch_changer.py b/maintainer-scripts/branch_changer.py index 238333e..de252d2 100755 --- a/maintainer-scripts/branch_changer.py +++ b/maintainer-scripts/branch_changer.py @@ -43,7 +43,7 @@ import re import requests -from semantic_version import SimpleSpec +from semantic_version import Version base_url = 'https://gcc.gnu.org/bugzilla/rest.cgi/' statuses = ['UNCONFIRMED', 'ASSIGNED', 'SUSPENDED', 'NEW', 'WAITING', 'REOPENED'] @@ -149,9 +149,15 @@ class Bug: new_summary = self.regex_match.group(1) + new_version + self.regex_match.group(3) + self.regex_match.group(4) return new_summary + @staticmethod + def to_version(version): + if len(version.split('.')) == 2: + version += '.0' + return Version(version) + def serialize_known_to_fail(self): assert type(self.fail_versions) is list - return ', '.join(sorted(self.fail_versions, key=lambda x: SimpleSpec(x))) + return ', '.join(sorted(self.fail_versions, key=self.to_version)) def modify_bug(self, api_key, params, doit): u = base_url + 'bug/' + str(self.data['id']) |