summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2014-06-06 19:40:23 +0200
committerGuido Günther <agx@sigxcpu.org>2014-06-06 19:40:23 +0200
commit3430976a0c4e4f3deb6eac0a6d73ca25b4781314 (patch)
tree957c7f7c97fde6c0203f858ccc083b047fdd4ed9
parentacbf3dd87ee59069efac5cf0c4c801bfa375308f (diff)
parent4d69afd6a6f29284218e3b3ccc386ec9655172c2 (diff)
Merge tag 'v0.0.7' into debian/master
whatmaps 0.0.7
-rw-r--r--apt/50whatmaps_apt2
-rw-r--r--whatmaps/debiandistro.py1
-rw-r--r--whatmaps/process.py2
3 files changed, 3 insertions, 2 deletions
diff --git a/apt/50whatmaps_apt b/apt/50whatmaps_apt
index cefb5fe..632efdd 100644
--- a/apt/50whatmaps_apt
+++ b/apt/50whatmaps_apt
@@ -1,3 +1,3 @@
-DPkg::Pre-Install-Pkgs { "/usr/bin/whatmaps --apt --restart --print-cmds=/var/lib/whatmaps/restart.sh" };
+DPkg::Pre-Install-Pkgs { "/usr/bin/whatmaps --apt --restart --print-cmds=/var/lib/whatmaps/restart.sh || true" };
DPkg::Post-Invoke { "if [ -x /var/lib/whatmaps/restart.sh ]; then /var/lib/whatmaps/restart.sh; rm -f /var/lib/whatmaps/restart.sh; fi" };
DPkg::Tools::Options::/usr/bin/whatmaps::Version "2";
diff --git a/whatmaps/debiandistro.py b/whatmaps/debiandistro.py
index 54c706a..4a3d0db 100644
--- a/whatmaps/debiandistro.py
+++ b/whatmaps/debiandistro.py
@@ -26,6 +26,7 @@ except ImportError:
lsb_release = None
import logging
+import string
import subprocess
import sys
diff --git a/whatmaps/process.py b/whatmaps/process.py
index f3d5dcd..1abde23 100644
--- a/whatmaps/process.py
+++ b/whatmaps/process.py
@@ -36,7 +36,7 @@ class Process(object):
if m:
self.exe = m.group('exe')
self.deleted = True
- logging.error("Using deleted exe %s", self.exe)
+ logging.info("Using deleted exe %s", self.exe)
if not os.path.exists(self.exe):
logging.debug("%s doesn't exist", self.exe)
self.cmdline = open(self._procpath('%d/cmdline' % self.pid)).read()