commit 053dcd502d9342e4528fccb7a7c0c07a07d99a37 Author: David Fifield david@bamsoftware.com Date: Sat Jun 1 22:35:43 2013 -0700

Break getopt lines. --- facilitator/facilitator-email-poller | 3 ++- facilitator/facilitator-reg-daemon | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/facilitator/facilitator-email-poller b/facilitator/facilitator-email-poller index 6b5dd60..2e6bd4a 100755 --- a/facilitator/facilitator-email-poller +++ b/facilitator/facilitator-email-poller @@ -127,7 +127,8 @@ def log(msg): options.email_addr = DEFAULT_EMAIL_ADDRESS options.imap_addr = (DEFAULT_IMAP_HOST, DEFAULT_IMAP_PORT)

-opts, args = getopt.gnu_getopt(sys.argv[1:], "de:hi:l:p:", ["debug", "disable-pin", "email=", "help", "imap=", "imaplib-debug", "log=", "pass=", "pidfile=", "privdrop-user=", "unsafe-logging"]) +opts, args = getopt.gnu_getopt(sys.argv[1:], "de:hi:l:p:", + ["debug", "disable-pin", "email=", "help", "imap=", "imaplib-debug", "log=", "pass=", "pidfile=", "privdrop-user=", "unsafe-logging"]) for o, a in opts: if o == "-d" or o == "--debug": options.daemonize = False diff --git a/facilitator/facilitator-reg-daemon b/facilitator/facilitator-reg-daemon index b250e71..bf39696 100755 --- a/facilitator/facilitator-reg-daemon +++ b/facilitator/facilitator-reg-daemon @@ -136,7 +136,8 @@ class Server(SocketServer.ThreadingMixIn, SocketServer.TCPServer): def main(): global rsa

- opts, args = getopt.gnu_getopt(sys.argv[1:], "dhk:l:p:", ["debug", "help", "key=", "log=", "port=", "pidfile=", "privdrop-user=", "unsafe-logging"]) + opts, args = getopt.gnu_getopt(sys.argv[1:], "dhk:l:p:", + ["debug", "help", "key=", "log=", "port=", "pidfile=", "privdrop-user=", "unsafe-logging"]) for o, a in opts: if o == "-d" or o == "--debug": options.daemonize = False