yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2303 from jberry-suse/origin-manager-annotate-pending

Browse Source 
osclib/origin: origin_annotation_dump(): include pending information.
This commit is contained in:
Jimmy Berry 2019-11-08 14:50:59 -06:00 committed by GitHub
commit a0488c3fbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osclib/origin.py
View File

@ -327,7 +327,14 @@ def origin_find_fallback(apiurl, target_project, package, source_hash, user):
return None
def origin_annotation_dump(origin_info_new, origin_info_old, override=False, raw=False):
data = {'origin': str(origin_info_new.project) if origin_info_new else 'None'}
data = {}
if origin_info_new is None:
data['origin'] = str(origin_info_new)
else:
data['origin'] = str(origin_info_new.project)
if origin_info_new.pending:
data['pending'] = origin_info_new.pending.identifier
if origin_info_old and origin_info_new.project != origin_info_old.project:
data['origin_old'] = str(origin_info_old.project)