From a7ce23cec4a4a581b88c226418dc702dcd19bceb Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Fri, 9 Apr 2021 11:35:09 +0200 Subject: branch_changer: fix usage of Version class. maintainer-scripts/ChangeLog: * branch_changer.py: Fix usage of Version class. --- maintainer-scripts/branch_changer.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'maintainer-scripts') 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']) -- cgit v1.1