From: Adrian Likins <alikins@redhat.com>
Date: Thu, 24 Jul 2008 16:42:04 +0000 (-0400)
Subject: merge with the code from func
X-Git-Tag: v0.24~12
X-Git-Url: https://pwan.org/git/?p=certmaster.git;a=commitdiff_plain;h=621cc4e377e0bf0a48a7bbbf384a3f28d9933be9

merge with the code from func
remove a spurious debug line
---

diff --git a/certmaster/utils.py b/certmaster/utils.py
index 588e986..61721ac 100755
--- a/certmaster/utils.py
+++ b/certmaster/utils.py
@@ -44,7 +44,7 @@ def daemonize(pidfile=None):
     Writes the new PID to the provided file name if not None.
     """
 
-    print pidfile
+#    print pidfile
     pid = os.fork()
     if pid > 0:
         sys.exit(0)
@@ -57,12 +57,15 @@ def daemonize(pidfile=None):
             open(pidfile, "w").write(str(pid))
         sys.exit(0)
 
+
 def nice_exception(etype, evalue, etb):
-    # FIXME: I believe we can remove this function
     etype = str(etype)
-    lefti = etype.index("'") + 1
-    righti = etype.rindex("'")
-    nicetype = etype[lefti:righti]
+    try:
+        lefti = etype.index("'") + 1
+        righti = etype.rindex("'")
+        nicetype = etype[lefti:righti]
+    except:
+        nicetype = etype
     nicestack = string.join(traceback.format_list(traceback.extract_tb(etb)))
     return [ REMOTE_ERROR, nicetype, str(evalue), nicestack ]