From fb3eb29429c278df683d90a06f65d752c4f59ab4 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Mon, 6 Sep 2010 09:44:18 +0200 Subject: Format debugging output --- whatmaps | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'whatmaps') diff --git a/whatmaps b/whatmaps index 523f6d9..b1fdb46 100755 --- a/whatmaps +++ b/whatmaps @@ -191,13 +191,13 @@ def main(argv): shared_objects = [] parser = OptionParser(usage='%prog [options] pkg1 [pkg2 pkg3 pkg4]') - parser.add_option("--verbose", action="store_true", dest="verbose", default=False, - help="verbose command execution") + parser.add_option("--debug", action="store_true", dest="debug", default=False, + help="enable debug output") parser.add_option("--restart", action="store_true", dest="restart", default=False, help="Restart services") (options, args) = parser.parse_args(argv[1:]) - if options.verbose: + if options.debug: level = logging.DEBUG else: level = logging.WARNING @@ -216,20 +216,20 @@ def main(argv): else: pkgs = [ distro.pkg(arg) for arg in args ] - # Find shared objects of newly installed packages + # Find shared objects of updated packages for pkg in pkgs: try: shared_objects += pkg.shared_objects except PkgError: logging.error("Cannot parse contents of %s" % pkg.name) return 1 - logging.debug("Shared objects: %s", shared_objects) - logging.debug("") + logging.debug("Found shared objects:") + map(lambda x: logging.debug(" %s", x), shared_objects) # Find processes that map them restart_procs = check_maps(get_all_pids(), shared_objects) - logging.debug("Processes that map them: %s", restart_procs) - logging.debug("") + logging.debug("Processes that map them:") + map(lambda (x, y): logging.debug(" Exe: %s Pids: %s", x, y), restart_procs.items()) # Find packages that contain the binaries of these processes pkgs = {} @@ -244,8 +244,9 @@ def main(argv): pkg.procs = [ proc ] pkgs[pkg.name] = pkg - for pkg in pkgs.values(): - logging.debug("%s: %s", pkg.name, pkg.procs) + logging.debug("Packages and binaries:") + map(lambda x: logging.debug(" Pkg: %s, binaries: %s" % (x.name, x.procs)), + pkgs.values()) all_services = set() for pkg in pkgs.values(): -- cgit v1.2.3