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

Merge pull request #1292 from nilxam/ignore_deleted_pkg

Browse Source 
compare_pkglist: do not submit package if it has removed from target
This commit is contained in:
Ludwig Nussel 2017-12-08 15:46:20 +01:00 committed by GitHub
commit c0266029ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compare_pkglist.py
View File

@ -156,6 +156,11 @@ class CompareList(object):
existin_packages = self.get_source_packages(self.existin) existin_packages = self.get_source_packages(self.existin)
if not self.removedonly: if not self.removedonly:
if self.submitto:
dest = self.submitto
else:
dest = self.new_prj
removed_pkgs_in_target = self.removed_pkglist(dest)
submit_counter = 0 submit_counter = 0
for pkg in source: for pkg in source:
if pkg.startswith('000') or pkg.startswith('_'): if pkg.startswith('000') or pkg.startswith('_'):
@ -171,7 +176,12 @@ class CompareList(object):
if pkg not in existin_packages: if pkg not in existin_packages:
continue continue
if pkg in removed_pkgs_in_target:
print("New package but has removed from {:<8} - {}".format(self.new_prj, pkg))
continue
print("New package than {:<8} - {}".format(self.new_prj, pkg)) print("New package than {:<8} - {}".format(self.new_prj, pkg))
if self.submit: if self.submit:
if self.submit_limit and submit_counter > int(self.submit_limit): if self.submit_limit and submit_counter > int(self.submit_limit):
return return