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

Merge pull request #1976 from jberry-suse/origin-manager-revision-state-none-origin

Browse Source 
origin-manager: handle no origin when determining revision state.
This commit is contained in:
Stephan Kulow 2019-05-03 06:45:56 +02:00 committed by GitHub
commit 6508d76633
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osclib/origin.py
View File

@ -482,8 +482,8 @@ def policy_input_evaluate_reviews_not_allowed(policy, inputs):
return reviews_not_allowed return reviews_not_allowed
def origin_revision_state(apiurl, target_project, package, origin_info=None, limit=10): def origin_revision_state(apiurl, target_project, package, origin_info=False, limit=10):
if not origin_info: if origin_info is False:
origin_info = origin_find(apiurl, target_project, package) origin_info = origin_find(apiurl, target_project, package)
revisions = [] revisions = []
@ -492,8 +492,11 @@ def origin_revision_state(apiurl, target_project, package, origin_info=None, lim
# considering double the limit of revisions. The goal is to know how many # considering double the limit of revisions. The goal is to know how many
# revisions behind the package in target project is and if it deviated from # revisions behind the package in target project is and if it deviated from
# origin, not that it ended up with every revision found in origin project. # origin, not that it ended up with every revision found in origin project.
origin_project = origin_info.project.rstrip('~') if origin_info is None:
origin_hashes = list(package_source_hash_history(apiurl, origin_project, package, limit * 2, True)) origin_hashes = []
else:
origin_project = origin_info.project.rstrip('~')
origin_hashes = list(package_source_hash_history(apiurl, origin_project, package, limit * 2, True))
target_hashes = list(package_source_hash_history(apiurl, target_project, package, limit)) target_hashes = list(package_source_hash_history(apiurl, target_project, package, limit))
for source_hash in origin_hashes: for source_hash in origin_hashes:
if source_hash not in target_hashes: if source_hash not in target_hashes: