From 1b59d859f2442dd859fa255a50d3d149c5320213 Mon Sep 17 00:00:00 2001 From: Santiago Garcia Mantinan Date: Tue, 7 Jul 2015 07:17:22 +0200 Subject: Respect jessie apache package rename Closes: #791569 --- whatmaps/debiandistro.py | 1 + 1 file changed, 1 insertion(+) diff --git a/whatmaps/debiandistro.py b/whatmaps/debiandistro.py index 2a095d1..2725265 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' ], -- cgit v1.2.3 From 7e838a0c18f3ad0f574e3bd7c5c4949701264f01 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Wed, 24 Feb 2016 09:18:59 +0100 Subject: The usual 2to3 string encoding madness --- tests/test_pkg.py | 14 +++++++------- tests/test_systemd.py | 2 +- whatmaps/pkg.py | 2 +- whatmaps/systemd.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/test_pkg.py b/tests/test_pkg.py index 8006b19..b7707b8 100644 --- a/tests/test_pkg.py +++ b/tests/test_pkg.py @@ -40,8 +40,8 @@ class TestPkg(unittest.TestCase): p._list_contents = '/does/not/matter' PopenMock = mock.return_value PopenMock.communicate.return_value = [ - '/package/content', - '/more/package/content', + b'/package/content', + b'/more/package/content', ] PopenMock.returncode = 0 result = p._get_contents() @@ -62,11 +62,11 @@ class TestPkg(unittest.TestCase): p = Pkg('doesnotmatter') p._list_contents = '/does/not/matter' PopenMock = mock.return_value - PopenMock.communicate.return_value = ['\n'.join([ - '/lib/foo.so.1', - '/lib/bar.so', - '/not/a/shared/object', - '/not/a/shared/object.soeither', + PopenMock.communicate.return_value = [b'\n'.join([ + b'/lib/foo.so.1', + b'/lib/bar.so', + b'/not/a/shared/object', + b'/not/a/shared/object.soeither', ])] PopenMock.returncode = 0 result = p.shared_objects diff --git a/tests/test_systemd.py b/tests/test_systemd.py index 2fbdfdc..f5af3c9 100644 --- a/tests/test_systemd.py +++ b/tests/test_systemd.py @@ -47,7 +47,7 @@ class TestSystemd(unittest.TestCase): CGroup: name=systemd:/system/libvirt-bin.service ├─ 952 /usr/sbin/libvirtd └─1355 /usr/sbin/dnsmasq --conf-file=/var/lib/libvirt/dnsmasq/default.conf - """ + """.encode('utf-8') with patch('os.path.exists', return_value=True): with patch('subprocess.Popen') as mock: PopenMock = mock.return_value 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/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'): -- cgit v1.2.3 From 11ca10034c04267da8b00d2ef940b0548a13ef42 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Sat, 6 Feb 2016 12:28:03 +0100 Subject: Use python3 instead of python2 --- setup.py | 2 +- whatmaps/command.py | 12 ++++++------ whatmaps/debiandistro.py | 2 +- whatmaps/process.py | 1 - whatmaps/redhatdistro.py | 1 - 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/setup.py b/setup.py index cdadd50..be05caa 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # vim: set fileencoding=utf-8 : # # (C) 2010,2014 Guido Günther 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 @@ -16,7 +16,7 @@ # along with this program. If not, see . # -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 2725265..32f3774 100644 --- a/whatmaps/debiandistro.py +++ b/whatmaps/debiandistro.py @@ -166,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/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 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 -- cgit v1.2.3