From 00e855d98b0cd1da2c5c8776da84a9673f1e9670 Mon Sep 17 00:00:00 2001 From: Anders Blomdell <anders.blomdell@control.lth.se> Date: Mon, 9 Nov 2020 11:45:44 +0100 Subject: [PATCH] Add printing of scripts/commands in --dependency-tree --- find_python2.py | 2 -- src/mio.py | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/find_python2.py b/find_python2.py index c79c600..2713b12 100755 --- a/find_python2.py +++ b/find_python2.py @@ -49,8 +49,6 @@ if __name__ == '__main__': print('XXX ', l) pass - print(FILES) - print(len(FILES)) PYTHON = set() PYTHON2 = set() for f in FILES: diff --git a/src/mio.py b/src/mio.py index 4c89f2a..1f239d1 100755 --- a/src/mio.py +++ b/src/mio.py @@ -312,8 +312,21 @@ if __name__ == '__main__': if options.dependency_tree != None: def dump_tree(name, indent=0): + def command_or_script(cos, prefix=''): + if cos.command[0] != None: + print("%s [%s command] %s" % ( + (' '*indent, prefix, cos.command[0]))) + pass + pass + if cos.script[0] != None: + print("%s [%s script] %s" % ( + (' '*indent, prefix, cos.script[0]))) + pass + pass print('%s%s' % (' '*indent, name)) tree = rules.get(name) + for p in tree._pre_: + command_or_script(p, 'pre') if not options.noyum: for r in tree._rpm_: print("%s[r] %s" % (' '*(indent+1), r.name[0])) @@ -331,11 +344,13 @@ if __name__ == '__main__': f.source[0] or f.name[0])) print('%s[f] %s = %s' % (' '*(indent+1), f.name[0], src)) pass + for p in tree._post_: + command_or_script(p, 'post') for d in tree._dependency_: dump_tree(d.name[0], indent+1) pass pass - todo = [i for l in options.dependency_tree for i in l] + todo = [i for l in options.dependency_tree for i in l] # Flatten list if len(todo) == 0: tree = parse('hostinfo.xml') todo = [ h.name[0] for h in tree._group_] -- GitLab