| |
@@ -78,15 +78,24 @@
|
| |
else:
|
| |
return False
|
| |
|
| |
+ def release_from_number(release_num):
|
| |
+ """
|
| |
+ Returns release string (Fedora XX) from number
|
| |
+ Returns "Rawhide" if release number is equal to Rawhide number
|
| |
+ """
|
| |
+ releases = CACHE.get("fedora_releases")
|
| |
+ if release_num.lower() == "rawhide" or release_num == releases["rawhide"]:
|
| |
+ return "Rawhide"
|
| |
+ return "Fedora %s" % release_num
|
| |
|
| |
def release_from_nevra(nevra):
|
| |
"""
|
| |
Returns fcXX from nevra
|
| |
"""
|
| |
split = nevra.split(".")[-1]
|
| |
- if len(split) > 1:
|
| |
- return split
|
| |
- return "Unknown Release"
|
| |
+ if len(split) <= 1:
|
| |
+ return "Unknown"
|
| |
+ return "Fedora %s" % split[-2:]
|
| |
|
| |
|
| |
def process_update(update):
|
| |
@@ -372,7 +381,7 @@
|
| |
"status": bug.status,
|
| |
"modified": str(bug.last_change_time),
|
| |
"reported": str(bug.creation_time),
|
| |
- "release": bug.version,
|
| |
+ "release": release_from_number(bug.version),
|
| |
"keywords": bug.keywords,
|
| |
"comments": (len(bug.comments) - 1), # Let's ignore the first comment that every bug has
|
| |
"url": "https://bugzilla.redhat.com/%s" % bug.id
|
| |
@@ -514,8 +523,9 @@
|
| |
data[package] = []
|
| |
for release in fti_data:
|
| |
if package in fti_data[release]:
|
| |
- data[package].append({"release": release,
|
| |
- "reason": fti_data[release][package]})
|
| |
+ data[package].append({"release": release_from_number(release),
|
| |
+ "reason": fti_data[release][package],
|
| |
+ "url": "https://pagure.io/fedora-health-check/blob/master/f/reports/report-%s.md" % release})
|
| |
return data
|
| |
|
| |
|
| |
In order to allow filtering by Fedora Release in Packager Dashboard[0], we should unify release format returned in the api.
Proposed format is release: "Fedora XX" or "Rawhide"
[0] https://pagure.io/fedora-qa/packager_dashboard/issue/6