update getop parsing in python code

fix argument -c to ivamd for return codes


git-svn-id: file:///home/lennart/svn/public/ivam2/trunk@60 dbf6933d-3bce-0310-9bcc-ed052ba35b35

3 files changed, 21 insertions, 21 deletions

diff --git a/clients/ivam-autobox b/clients/ivam-autobox
index bf7e563..800953e 100755
--- a/clients/ivam-autobox
+++ b/clients/ivam-autobox
@@ -41,26 +41,26 @@ def parseArgs(vb, argv):
     notifyScript = "ivam-newvoicebox"
 
     for o, a in opts:
-        if o in ("-d", "--debug"):
+        if o in ("-d", "--debug",):
             ivamCore.DEBUG = True
             
-        elif o in ("-h", "--help"):
+        elif o in ("-h", "--help",):
             usage()
             sys.exit()
             
-        elif o in ("--default-record-time"):
+        elif o in ("--default-record-time",):
             recordTime = int(a)
             
-        elif o in ("--default-pin"):
+        elif o in ("--default-pin",):
             pin = a
             
-        elif o in ("--default-pin-file"):
+        elif o in ("--default-pin-file",):
             pin = getContents(a)
 
-        elif o in ("--notify-script"):
+        elif o in ("--notify-script",):
             notifyScript = a
 
-        elif o in ("--email"):
+        elif o in ("--email",):
             email = a
 
     dname = "msn-" + os.getenv("RINGMSN")
@@ -81,19 +81,19 @@ def parseArgs(vb, argv):
     vb.setDirectory(dname)
 
     for o, a in opts:
-        if o in ("--record-time"):
+        if o in ("--record-time",):
             vb.recordTime = int(a)
             
-        elif o in ("--pin"):
+        elif o in ("--pin",):
             vb.setPin(a)
             
-        elif o in ("--pin-file"):
+        elif o in ("--pin-file",):
             vb.setPin(getContents(a))
 
-        elif o in ("--record-only"):
+        elif o in ("--record-only",):
             vb.recordOnly = True
 
-        elif o in ("--no-record"):
+        elif o in ("--no-record",):
             vb.noRecord = True
 
 def main():
diff --git a/clients/ivam-voicebox b/clients/ivam-voicebox
index bc5a83c..88b6778 100755
--- a/clients/ivam-voicebox
+++ b/clients/ivam-voicebox
@@ -44,29 +44,29 @@ def parseArgs(vb, argv):
     vb.setDirectory(dname)
 
     for o, a in opts:
-        if o in ("-d", "--debug"):
+        if o in ("-d", "--debug",):
             ivamCore.DEBUG = True
             
-        elif o in ("-h", "--help"):
+        elif o in ("-h", "--help",):
             usage()
             sys.exit()
             
-        elif o in ("--record-time"):
+        elif o in ("--record-time",):
             vb.recordTime = int(a)
             
-        elif o in ("--pin"):
+        elif o in ("--pin",):
             vb.setPin(a)
             
-        elif o in ("--pin-file"):
+        elif o in ("--pin-file",):
             vb.setPin(getContents(a))
             
-        elif o in ("--message-program"):
+        elif o in ("--message-program",):
             vb.messageProgram = a
 
-        elif o in ("--record-only"):
+        elif o in ("--record-only",):
             vb.recordOnly = True
 
-        elif o in ("--no-record"):
+        elif o in ("--no-record",):
             vb.noRecord = True
 
 
diff --git a/src/main.c b/src/main.c
index 4e28329..cba75c7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -254,7 +254,7 @@ int main(int argc, char*argv[]) {
         else
             daemon_log(LOG_INFO, "Daemon not running.");
 
-        return 1;
+        return pid >= 0 ? 0 : 1;
     }
 
     if ((pid = daemon_pid_file_is_running()) >= 0) {