diff options
Diffstat (limited to 'whatmaps')
-rwxr-xr-x | whatmaps/command.py | 12 | ||||
-rw-r--r-- | whatmaps/debiandistro.py | 3 | ||||
-rw-r--r-- | whatmaps/pkg.py | 2 | ||||
-rw-r--r-- | whatmaps/process.py | 1 | ||||
-rw-r--r-- | whatmaps/redhatdistro.py | 1 | ||||
-rw-r--r-- | whatmaps/systemd.py | 2 |
6 files changed, 10 insertions, 11 deletions
diff --git a/whatmaps/command.py b/whatmaps/command.py index c39b06d..0f8e433 100755 --- a/whatmaps/command.py +++ b/whatmaps/command.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/python3 -u # vim: set fileencoding=utf-8 : # # (C) 2010,2014 Guido Günther <agx@sigxcpu.org> @@ -16,7 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -from __future__ import print_function + import errno import glob @@ -83,7 +83,7 @@ def find_pkgs(procs, distro): if pkgs: logging.info("Packages that ship the affected binaries:") - for pkg in pkgs.values(): + for pkg in list(pkgs.values()): logging.info(" Pkg: %s, binaries: %s" % (pkg.name, pkg.procs)) return pkgs @@ -96,7 +96,7 @@ def find_services(pkgs, distro): """ all_services = set() - for pkg in pkgs.values(): + for pkg in list(pkgs.values()): services = set(pkg.services + distro.pkg_services(pkg)) services -= set(distro.pkg_service_blacklist(pkg)) if not services: @@ -112,7 +112,7 @@ def find_systemd_units(procmap, distro): """Find systemd units that contain the given processes""" units = set() - for dummy, procs in procmap.items(): + for dummy, procs in list(procmap.items()): for proc in procs: try: unit = Systemd.process_to_unit(proc) @@ -201,7 +201,7 @@ def main(argv): else: raise logging.debug("Processes that map them:") - for exe, pids in restart_procs.items(): + for exe, pids in list(restart_procs.items()): logging.debug(" Exe: %s Pids: %s", exe, pids), if Systemd.is_running(): diff --git a/whatmaps/debiandistro.py b/whatmaps/debiandistro.py index 2a095d1..32f3774 100644 --- a/whatmaps/debiandistro.py +++ b/whatmaps/debiandistro.py @@ -43,6 +43,7 @@ class DebianDistro(Distro): _pkg_services = { 'apache2-mpm-worker': [ 'apache2' ], 'apache2-mpm-prefork': [ 'apache2' ], 'apache2.2-bin': [ 'apache2' ], + 'apache2-bin': [ 'apache2' ], 'dovecot-imapd': [ 'dovecot' ], 'dovecot-pop3d': [ 'dovecot' ], 'exim4-daemon-light': [ 'exim4' ], @@ -165,7 +166,7 @@ class DebianDistro(Distro): security_update_origins = klass._security_update_origins() security_updates = {} - for pkg in pkgs.values(): + for pkg in list(pkgs.values()): cache_pkg = cache[pkg.name] for cache_version in cache_pkg.version_list: if pkg.version == cache_version.ver_str: diff --git a/whatmaps/pkg.py b/whatmaps/pkg.py index ab9088d..4290d0b 100644 --- a/whatmaps/pkg.py +++ b/whatmaps/pkg.py @@ -63,7 +63,7 @@ class Pkg(object): output = list_contents.communicate()[0] if list_contents.returncode: raise PkgError("Failed to list package contents for '%s'" % self.name) - self._contents = output.split('\n') + self._contents = output.decode('utf-8').split('\n') return self._contents @property diff --git a/whatmaps/process.py b/whatmaps/process.py index 23ed7ab..a39da89 100644 --- a/whatmaps/process.py +++ b/whatmaps/process.py @@ -1,4 +1,3 @@ -#!/usr/bin/python -u # vim: set fileencoding=utf-8 : # # (C) 2010,2014 Guido Günther <agx@sigxcpu.org> diff --git a/whatmaps/redhatdistro.py b/whatmaps/redhatdistro.py index 9300648..0427c30 100644 --- a/whatmaps/redhatdistro.py +++ b/whatmaps/redhatdistro.py @@ -1,4 +1,3 @@ -#!/usr/bin/python -u # vim: set fileencoding=utf-8 : # # (C) 2010,2014 Guido Günther <agx@sigxcpu.org> diff --git a/whatmaps/systemd.py b/whatmaps/systemd.py index ef15a26..9bc03b1 100644 --- a/whatmaps/systemd.py +++ b/whatmaps/systemd.py @@ -38,7 +38,7 @@ class Systemd(object): if systemctl_status.returncode: return None else: - parts = output.split() + parts = output.decode('utf-8').split() if parts[0].endswith('.service'): return parts[0] elif parts[1].endswith('.service'): |