diff --git a/pkglistgen-sle.py b/pkglistgen-sle.py index 9c98ac02..2916d301 100755 --- a/pkglistgen-sle.py +++ b/pkglistgen-sle.py @@ -35,7 +35,7 @@ class CommandLineInterface(pkglistgen.CommandLineInterface): for group in self.tool.groups.values(): setattr(g, group.safe_name, group) - g.sle_minimal.solve(ignore_recommended=True) + g.sle_minimal.solve(ignore_recommended=True, extra=['dummy-release']) # g.release_packages_sles.solve() # g.release_packages_leanos.solve(base = g.sle_minimal) @@ -64,8 +64,6 @@ class CommandLineInterface(pkglistgen.CommandLineInterface): g.fonts_initrd.solve(base = g.fonts) - g.bootloader.solve(base = g.sle_base) - g.python.solve(base = g.sle_base) g.php7.solve(base = g.sle_base) diff --git a/pkglistgen.py b/pkglistgen.py index faca91ed..48f952be 100755 --- a/pkglistgen.py +++ b/pkglistgen.py @@ -244,9 +244,6 @@ class Group(object): if autodeps: autodeps -= self.packages[arch] - if not packages and not autodeps: - return None - name = self.name if arch != '*': name += '.' + arch @@ -291,10 +288,10 @@ class Group(object): return root def dump(self): - for arch in sorted(self.architectures()): + archs = ('*') + ARCHITECTURES + for arch in archs: x = self.toxml(arch) - if x is not None: - print(ET.tostring(x, pretty_print = True)) + print(ET.tostring(x, pretty_print = True)) class PkgListGen(ToolBase.ToolBase): @@ -365,6 +362,7 @@ class PkgListGen(ToolBase.ToolBase): def _write_all_groups(self): self._check_supplements() + archs = ('*',) + ARCHITECTURES for name in self.groups: group = self.groups[name] fn = '{}.group'.format(group.name) @@ -374,11 +372,10 @@ class PkgListGen(ToolBase.ToolBase): os.unlink(fn) continue with open(os.path.join(self.output_dir, fn), 'w') as fh: - for arch in sorted(group.architectures()): + for arch in archs: x = group.toxml(arch) - if x is not None: - #fh.write(ET.tostring(x, pretty_print = True, doctype = '')) - fh.write(ET.tostring(x, pretty_print = True)) + #fh.write(ET.tostring(x, pretty_print = True, doctype = '')) + fh.write(ET.tostring(x, pretty_print = True)) def _parse_product(self, root): print(root.find('.//products/product/name').text)