From 0e3641610eb25e72a7ecf8abeaa82398dc3c88e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Wed, 16 Apr 2014 15:47:58 +0200 Subject: [PATCH] support maintenance release request with acceptinfo data (OBS 2.6) --- NEWS | 3 +++ osc/core.py | 11 ++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 8bdae015..e71089eb 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +0.146 + - support maintenance release request with acceptinfo data (OBS 2.6) + 0.145 - allow to use the set-release option when running a manual release - added support for "osc requestmaintainership PROJECT" diff --git a/osc/core.py b/osc/core.py index 855ded11..8bec3f16 100644 --- a/osc/core.py +++ b/osc/core.py @@ -1682,8 +1682,11 @@ class Package: Update the local _meta file in the store. It is replaced with the version pulled from upstream. """ - meta = ''.join(show_package_meta(self.apiurl, self.prjname, self.name)) - store_write_string(self.absdir, '_meta', meta + '\n') + meta = show_package_meta(self.apiurl, self.prjname, self.name) + if meta != "": + # is empty for _project for example + meta = ''.join(show_package_meta(self.apiurl, self.prjname, self.name)) + store_write_string(self.absdir, '_meta', meta + '\n') def findfilebyname(self, n): for i in self.filelist: @@ -2361,7 +2364,9 @@ class Action: 'acceptinfo_oxsrcmd5', 'opt_updatelink'), 'add_role': ('tgt_project', 'tgt_package', 'person_name', 'person_role', 'group_name', 'group_role'), 'set_bugowner': ('tgt_project', 'tgt_package', 'person_name'), # obsoleted by add_role - 'maintenance_release': ('src_project', 'src_package', 'src_rev', 'tgt_project', 'tgt_package', 'person_name'), + 'maintenance_release': ('src_project', 'src_package', 'src_rev', 'tgt_project', 'tgt_package', 'person_name', + 'acceptinfo_rev', 'acceptinfo_srcmd5', 'acceptinfo_xsrcmd5', 'acceptinfo_osrcmd5', + 'acceptinfo_oxsrcmd5'), 'maintenance_incident': ('src_project', 'src_package', 'src_rev', 'tgt_project', 'tgt_releaseproject', 'person_name', 'opt_sourceupdate'), 'delete': ('tgt_project', 'tgt_package', 'tgt_repository'), 'change_devel': ('src_project', 'src_package', 'tgt_project', 'tgt_package'),