| |
@@ -600,7 +600,13 @@
|
| |
for page in range(0, 9):
|
| |
end_url = url
|
| |
end_url += f"&page={page}"
|
| |
- data = requests.get(end_url).json()
|
| |
+ try:
|
| |
+ response = requests.get(end_url)
|
| |
+ response.raise_for_status()
|
| |
+ data = response.json()
|
| |
+ except Exception as e:
|
| |
+ self.print_user(f"WARNING: exception happened when querying resultsdb: {e.msg}", success=True)
|
| |
+ continue
|
| |
for result in data["data"]:
|
| |
if nevr in result["data"]["nvr"]:
|
| |
success = True
|
| |
@@ -781,7 +787,6 @@
|
| |
side_tag_name = self.create_side_tag(conf["fedpkg"], folder=gitfolder)
|
| |
target = side_tag_name
|
| |
if version:
|
| |
- version += version
|
| |
self.bump_release(name, version, folder=gitfolder)
|
| |
else:
|
| |
self.bump_release(name, version=0, folder=gitfolder)
|
| |
@@ -800,17 +805,16 @@
|
| |
nevr_one = nevrs[package_one]
|
| |
nevr_two = nevrs[package_two]
|
| |
|
| |
- if nevr_one.startswith(package_one):
|
| |
- release_one = nevr_one[len(package_one):]
|
| |
- version = int(re.search(r'\d+', nevr_one).group())
|
| |
-
|
| |
- if nevr_two.startswith(package_two):
|
| |
- release_two = nevr_one[len(package_two):]
|
| |
+ version_1, version_2 = [
|
| |
+ [int(x) for x in re.search(r'(\d+)-(\d+)', nevr).groups()]
|
| |
+ for nevr in [nevr_one, nevr_two]]
|
| |
|
| |
- if release_one != release_two:
|
| |
- return version, False
|
| |
+ if version_1 == version_2:
|
| |
+ return f"{version_1[0]}-{version_1[1]}", True
|
| |
|
| |
- return version, True
|
| |
+ if version_1 < version_2:
|
| |
+ version_1 = version_2
|
| |
+ return f"{version_1[0]}-{version_1[1]+1}", False
|
| |
|
| |
|
| |
def run_command(command, cwd=None):
|
| |
