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

Merge pull request #2143 from jberry-suse/origin-manager-always-include-project-link

Browse Source 
osclib/origin: always include project link when fetching source history.
This commit is contained in:
Jimmy Berry 2019-08-06 07:39:54 -05:00 committed by GitHub
commit 914d106184
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osclib/origin.py
View File

@ -238,7 +238,8 @@ def origin_find(apiurl, target_project, package, source_hash=None, current=False
return None
def project_source_contain(apiurl, project, package, source_hash):
for source_hash_consider in package_source_hash_history(apiurl, project, package):
for source_hash_consider in package_source_hash_history(
apiurl, project, package, include_project_link=True):
project_source_log('contain', project, source_hash_consider, source_hash)
if source_hash_consider == source_hash:
return True
@ -285,7 +286,8 @@ def origin_find_fallback(apiurl, target_project, package, source_hash, user):
# Attempt to find a revision of target package that matches an origin.
first = True
for source_hash_consider in package_source_hash_history(apiurl, target_project, package):
for source_hash_consider in package_source_hash_history(
apiurl, target_project, package, include_project_link=True):
if first:
first = False
continue
@ -522,7 +524,7 @@ def origin_revision_state(apiurl, target_project, package, origin_info=False, li
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, True))
for source_hash in origin_hashes:
if source_hash not in target_hashes:
revisions.append(-1)