Hello community, here is the log from the commit of package openSUSE-release-tools for openSUSE:Factory checked in at 2018-01-31 19:53:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old) and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-release-tools" Wed Jan 31 19:53:37 2018 rev:47 rq:571312 version:20180131.d88eefe Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes 2018-01-30 15:44:39.597887046 +0100 +++ /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new/openSUSE-release-tools.changes 2018-01-31 19:54:03.571428488 +0100 @@ -1,0 +2,6 @@ +Wed Jan 31 09:04:02 UTC 2018 - opensuse-releaset...@opensuse.org + +- Update to version 20180131.d88eefe: + * adi: place :NonFree requests in separate adi with :NonFree path. + +------------------------------------------------------------------- Old: ---- openSUSE-release-tools-20180130.40c4c14.obscpio New: ---- openSUSE-release-tools-20180131.d88eefe.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-release-tools.spec ++++++ --- /var/tmp/diff_new_pack.CALt9a/_old 2018-01-31 19:54:04.199399285 +0100 +++ /var/tmp/diff_new_pack.CALt9a/_new 2018-01-31 19:54:04.199399285 +0100 @@ -20,7 +20,7 @@ %define source_dir osc-plugin-factory %define announcer_filename factory-package-news Name: openSUSE-release-tools -Version: 20180130.40c4c14 +Version: 20180131.d88eefe Release: 0 Summary: Tools to aid in staging and release work for openSUSE/SUSE License: GPL-2.0+ AND MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.CALt9a/_old 2018-01-31 19:54:04.243397238 +0100 +++ /var/tmp/diff_new_pack.CALt9a/_new 2018-01-31 19:54:04.243397238 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/osc-plugin-factory.git</param> - <param name="changesrevision">40c4c14db52af9b7fac403aa0ee3f0c62980d86f</param> + <param name="changesrevision">2d13b117830cc2fb5d06a2a78d4f73a8e1869b89</param> </service> </servicedata> ++++++ openSUSE-release-tools-20180130.40c4c14.obscpio -> openSUSE-release-tools-20180131.d88eefe.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20180130.40c4c14/osclib/adi_command.py new/openSUSE-release-tools-20180131.d88eefe/osclib/adi_command.py --- old/openSUSE-release-tools-20180130.40c4c14/osclib/adi_command.py 2018-01-30 08:34:06.000000000 +0100 +++ new/openSUSE-release-tools-20180131.d88eefe/osclib/adi_command.py 2018-01-31 09:57:51.000000000 +0100 @@ -81,6 +81,9 @@ splitter.group_by('./action/target/@devel_project') else: splitter.group_by('./action/source/@project') + + if not split: + splitter.group_by('./action/target/@nonfree') splitter.split() for group in sorted(splitter.grouped.keys()): @@ -89,7 +92,8 @@ name = None for request in splitter.grouped[group]['requests']: request_id = int(request.get('id')) - target_package = request.find('./action/target').get('package') + target = request.find('./action/target') + target_package = target.get('package') line = '- {} {}{:<30}{}'.format(request_id, Fore.CYAN, target_package, Fore.RESET) message = self.api.ignore_format(request_id) @@ -107,8 +111,9 @@ # request is processed from a particular group. if name is None: use_frozenlinks = group in source_projects_expand and not split + nonfree = bool(target.get('nonfree')) name = self.api.create_adi_project(None, - use_frozenlinks, group) + use_frozenlinks, group, nonfree) if not self.api.rq_to_prj(request_id, name): return False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20180130.40c4c14/osclib/request_splitter.py new/openSUSE-release-tools-20180131.d88eefe/osclib/request_splitter.py --- old/openSUSE-release-tools-20180130.40c4c14/osclib/request_splitter.py 2018-01-30 08:34:06.000000000 +0100 +++ new/openSUSE-release-tools-20180131.d88eefe/osclib/request_splitter.py 2018-01-31 09:57:51.000000000 +0100 @@ -121,6 +121,9 @@ target.set('devel_project', devel) StrategySuper.supplement(request) + if target_project == self.api.cnonfree: + target.set('nonfree', 'nonfree') + ring = self.ring_get(target_package) if ring: target.set('ring', ring) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20180130.40c4c14/osclib/stagingapi.py new/openSUSE-release-tools-20180131.d88eefe/osclib/stagingapi.py --- old/openSUSE-release-tools-20180130.40c4c14/osclib/stagingapi.py 2018-01-30 08:34:06.000000000 +0100 +++ new/openSUSE-release-tools-20180131.d88eefe/osclib/stagingapi.py 2018-01-31 09:57:51.000000000 +0100 @@ -1739,7 +1739,7 @@ l = ET.tostring(flink) http_PUT(url, data=l) - def create_adi_project(self, name, use_frozenlinks=False, src_prj=None): + def create_adi_project(self, name, use_frozenlinks=False, src_prj=None, nonfree=False): """Create an ADI project.""" if not name: name = self._candidate_adi_project() @@ -1757,6 +1757,11 @@ linkproject = '' repository = '<repository name="standard">' + if nonfree: + nonfree_path = "<path project=\"{}\" repository=\"standard\"/>".format(self.cnonfree) + else: + nonfree_path = '' + meta = """ <project name="{0}"> <title></title> @@ -1770,12 +1775,13 @@ <enable/> </debuginfo> {4} + {6} <path project="{5}" repository="standard"/> <path project="{1}" repository="standard"/> <arch>x86_64</arch> </repository> </project>""".format(name, self.project, self.extract_adi_number(name), linkproject, repository, - self.cstaging) + self.cstaging, nonfree_path) url = make_meta_url('prj', name, self.apiurl) http_PUT(url, data=meta) ++++++ openSUSE-release-tools.obsinfo ++++++ --- /var/tmp/diff_new_pack.CALt9a/_old 2018-01-31 19:54:05.351345713 +0100 +++ /var/tmp/diff_new_pack.CALt9a/_new 2018-01-31 19:54:05.351345713 +0100 @@ -1,5 +1,5 @@ name: openSUSE-release-tools -version: 20180130.40c4c14 -mtime: 1517297646 -commit: 40c4c14db52af9b7fac403aa0ee3f0c62980d86f +version: 20180131.d88eefe +mtime: 1517389071 +commit: d88eefe918ee3af4fb30d5dca6a7d56469e1d9c3