[Python-modules-commits] [pyro] 01/04: unapply patches

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to tag debian/13.14-2
in repository pyro.

commit 4f31b58c4937e1897df57af24853331825a01092
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Mon Dec 14 16:13:56 2015 +0000

    unapply patches
---
 Pyro/ext/daemonizer.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/Pyro/ext/daemonizer.py b/Pyro/ext/daemonizer.py
index 11b5061..e481877 100644
--- a/Pyro/ext/daemonizer.py
+++ b/Pyro/ext/daemonizer.py
@@ -47,9 +47,7 @@ class Daemonizer:
     """
     def __init__(self, pidfile=None):
         if not pidfile:
-            # PID file moved out of /tmp to avoid security vulnerability
-            # changed by Debian maintainer per Debian bug #631912
-            self.pidfile = "/var/run/pyro-%s.pid" % self.__class__.__name__.lower()
+            self.pidfile = "/tmp/%s.pid" % self.__class__.__name__.lower()
         else:
             self.pidfile = pidfile
 
@@ -123,16 +121,12 @@ class Daemonizer:
 
     def process_command_line(self, argv, verbose=1):
         usage = "usage:  %s  start | stop | restart | status | debug " \
-                "[--pidfile=...] " \
                 "(run as non-daemon)" % os.path.basename(argv[0])
         if len(argv) < 2:
             print usage
             raise SystemExit
         else:
             operation = argv[1]
-            if len(argv) > 2 and argv[2].startswith('--pidfile=') and \
-                len(argv[2]) > len('--pidfile='):
-                self.pidfile = argv[2][len('--pidfile='):]
         pid = self.get_pid()
         if operation == 'status':
             if self.is_process_running():

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyro.git