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

compare_pkglist: improve submission message

Browse Source
This commit is contained in:
Max Lin 2017-12-05 18:52:41 +08:00
parent 57aadf8eeb
commit b165e07db3
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compare_pkglist.py
View File

@ -116,12 +116,13 @@ class CompareList(object):
return ET.tostring(root) return ET.tostring(root)
return False return False
def submit_new_package(self, source, target, package): def submit_new_package(self, source, target, package, msg=None):
req = osc.core.get_request_list(self.apiurl, target, package, req_state=('new', 'review', 'declined')) req = osc.core.get_request_list(self.apiurl, target, package, req_state=('new', 'review', 'declined'))
if req: if req:
print("There is a request to %s / %s already, skip!"%(target, package)) print("There is a request to %s / %s already, skip!"%(target, package))
else: else:
msg = 'New package submitted by compare_pkglist' if not msg:
msg = 'New package submitted by compare_pkglist'
res = osc.core.create_submit_request(self.apiurl, source, package, target, package, message=msg) res = osc.core.create_submit_request(self.apiurl, source, package, target, package, message=msg)
if res and res is not None: if res and res is not None:
print('Created request %s for %s' % (res, package)) print('Created request %s for %s' % (res, package))
@ -179,10 +180,14 @@ class CompareList(object):
if not self.item_exists(self.submitfrom, pkg): if not self.item_exists(self.submitfrom, pkg):
print("%s not found in %s"%(pkg, self.submitfrom)) print("%s not found in %s"%(pkg, self.submitfrom))
continue continue
if self.submit_new_package(self.submitfrom, self.submitto, pkg): msg = "Automated submission of a package from %s to %s" % (self.submitfrom, self.submitto)
if self.existin:
msg += " that was included in %s" % (self.existin)
if self.submit_new_package(self.submitfrom, self.submitto, pkg, msg):
submit_counter += 1 submit_counter += 1
else: else:
if self.submit_new_package(self.old_prj, self.new_prj, pkg): msg = "Automated submission of a package from %s that is new in %s" % (self.old_prj, self.new_prj)
if self.submit_new_package(self.old_prj, self.new_prj, pkg, msg):
submit_counter += 1 submit_counter += 1
elif not self.newonly: elif not self.newonly:
diff = self.check_diff(pkg, self.old_prj, self.new_prj) diff = self.check_diff(pkg, self.old_prj, self.new_prj)