almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

comps_wrapper: Code clean up

Browse Source 
* Remove explicit option requirement. Argparse can take care of that
  while also making this information visible in help output.
* Simplify writing resulting comps.
* Remove unused code.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2017-06-29 14:51:15 +02:00
parent 9a3d04c305
commit afffb27f94
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bin/comps_filter
View File

@ -7,7 +7,6 @@ import fnmatch
import argparse import argparse
import lxml.etree import lxml.etree
import re import re
from io import StringIO
class CompsFilter(object): class CompsFilter(object):
@ -78,14 +77,11 @@ class CompsFilter(object):
for group in self.tree.xpath("/comps/group"): for group in self.tree.xpath("/comps/group"):
if not group.xpath("packagelist/packagereq"): if not group.xpath("packagelist/packagereq"):
group_id = group.xpath("id/text()")[0] group_id = group.xpath("id/text()")[0]
found = False
for pattern in keep_empty: for pattern in keep_empty:
if fnmatch.fnmatch(group_id, pattern): if fnmatch.fnmatch(group_id, pattern):
found = True
break break
if found: else:
continue group.getparent().remove(group)
group.getparent().remove(group)
def remove_empty_categories(self): def remove_empty_categories(self):
""" """
@ -148,20 +144,12 @@ class CompsFilter(object):
self.tree.write(file_obj, pretty_print=self.reindent, xml_declaration=True, encoding=self.encoding) self.tree.write(file_obj, pretty_print=self.reindent, xml_declaration=True, encoding=self.encoding)
file_obj.write("\n") file_obj.write("\n")
def pprint(self):
self.write(sys.stdout)
def xml(self):
io = StringIO()
self.write(io)
io.seek(0)
return io.read()
def main(): def main():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("--output", help="redirect output to a file") parser.add_argument("--output", help="redirect output to a file")
parser.add_argument("--arch", help="filter groups and packagews according to an arch") parser.add_argument("--arch", required=True,
help="filter groups and packages according to an arch")
parser.add_argument("--arch-only-groups", default=False, action="store_true", parser.add_argument("--arch-only-groups", default=False, action="store_true",
help="keep only arch groups, remove the rest") help="keep only arch groups, remove the rest")
parser.add_argument("--arch-only-packages", default=False, action="store_true", parser.add_argument("--arch-only-packages", default=False, action="store_true",
@ -186,9 +174,6 @@ def main():
opts = parser.parse_args() opts = parser.parse_args()
if opts.arch is None:
parser.error("please specify arch")
file_obj = open(opts.comps_file, "r") file_obj = open(opts.comps_file, "r")
f = CompsFilter(file_obj, reindent=not opts.no_reindent) f = CompsFilter(file_obj, reindent=not opts.no_reindent)
f.filter_packages(opts.arch, opts.arch_only_packages) f.filter_packages(opts.arch, opts.arch_only_packages)
@ -214,11 +199,7 @@ def main():
if opts.remove_environments: if opts.remove_environments:
f.remove_environments() f.remove_environments()
if opts.output: f.write(open(opts.output, 'w') if opts.output else sys.stdout)
out = open(opts.output, "w")
f.write(out)
else:
f.pprint()
if __name__ == "__main__": if __name__ == "__main__":