commit openSUSE-release-tools for openSUSE:Factory
Hello community, here is the log from the commit of package openSUSE-release-tools for openSUSE:Factory checked in at 2017-12-14 11:03:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old) and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openSUSE-release-tools" Thu Dec 14 11:03:39 2017 rev:31 rq:556772 version:20171213.3dde523 Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes 2017-12-12 21:23:28.220977105 +0100 +++ /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new/openSUSE-release-tools.changes 2017-12-14 11:03:42.841567606 +0100 @@ -1,0 +2,6 @@ +Wed Dec 13 18:08:56 UTC 2017 - opensuse-releaseteam@opensuse.org + +- Update to version 20171213.3dde523: + * pkglistgen: Output the overlaping packages into overlap.group + +------------------------------------------------------------------- Old: ---- openSUSE-release-tools-20171212.bffe857.obscpio New: ---- openSUSE-release-tools-20171213.3dde523.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-release-tools.spec ++++++ --- /var/tmp/diff_new_pack.xh5ZRo/_old 2017-12-14 11:03:44.033510065 +0100 +++ /var/tmp/diff_new_pack.xh5ZRo/_new 2017-12-14 11:03:44.033510065 +0100 @@ -20,7 +20,7 @@ %define source_dir osc-plugin-factory %define announcer_filename factory-package-news Name: openSUSE-release-tools -Version: 20171212.bffe857 +Version: 20171213.3dde523 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.xh5ZRo/_old 2017-12-14 11:03:44.085507555 +0100 +++ /var/tmp/diff_new_pack.xh5ZRo/_new 2017-12-14 11:03:44.085507555 +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">bffe8575d5cc901171a859a433cef303977484d8</param> + <param name="changesrevision">1a29bc50738686bdbe719737b893500409697dc7</param> </service> </servicedata> ++++++ openSUSE-release-tools-20171212.bffe857.obscpio -> openSUSE-release-tools-20171213.3dde523.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20171212.bffe857/pkglistgen.py new/openSUSE-release-tools-20171213.3dde523/pkglistgen.py --- old/openSUSE-release-tools-20171212.bffe857/pkglistgen.py 2017-12-12 07:22:40.000000000 +0100 +++ new/openSUSE-release-tools-20171213.3dde523/pkglistgen.py 2017-12-13 19:01:58.000000000 +0100 @@ -73,6 +73,7 @@ self.packages[a] = [] self.unresolvable[a] = dict() + self.comment = ' ### AUTOMATICALLY GENERATED, DO NOT EDIT ### ' self.srcpkgs = None self.develpkgs = [] self.silents = set() @@ -149,9 +150,6 @@ def solve(self, ignore_recommended=False, include_suggested = False): """ base: list of base groups or None """ - if self.solved: - return - solved = dict() for arch in self.architectures: solved[arch] = dict() @@ -276,7 +274,8 @@ self.solved_packages = solved self.solved = True - def check_dups(self, modules): + def check_dups(self, modules, overlap): + if not overlap: return packages = set(self.solved_packages['*']) for arch in self.architectures: packages.update(self.solved_packages[arch]) @@ -289,9 +288,10 @@ for arch in self.architectures: mp.update(m.solved_packages[arch]) if len(packages & mp): - print 'overlap_between_' + self.name + '_and_' + m.name + ':' + overlap.comment += '\n overlapping between ' + self.name + ' and ' + m.name for p in sorted(packages & mp): - print ' - ' + p + overlap.comment += '\n - ' + p + overlap._add_to_packages(p) def collect_devel_packages(self, modules): develpkgs = set() @@ -333,7 +333,7 @@ self._filter_already_selected(modules, self.recommends) self._filter_already_selected(modules, self.suggested) - def toxml(self, arch, ignore_broken = False): + def toxml(self, arch, ignore_broken = False, comment=None): packages = self.solved_packages[arch] name = self.name @@ -341,8 +341,9 @@ name += '.' + arch root = ET.Element('group', {'name': name}) - c = ET.Comment(' ### AUTOMATICALLY GENERATED, DO NOT EDIT ### ') - root.append(c) + if comment: + c = ET.Comment(comment) + root.append(c) if arch != '*': cond = ET.SubElement(root, 'conditional', { @@ -491,12 +492,15 @@ archs = ['*'] + self.architectures for name in self.groups: group = self.groups[name] - fn = '{}.group'.format(group.name) if not group.solved: continue + fn = '{}.group'.format(group.name) with open(os.path.join(self.output_dir, fn), 'w') as fh: + comment = group.comment for arch in archs: - x = group.toxml(arch, self.ignore_broken) + x = group.toxml(arch, self.ignore_broken, comment) + # only comment first time + comment = None x = ET.tostring(x, pretty_print=True) x = re.sub('\s* Reply
participants (1)
-
root@hilbert.suse.de