diff options
| author | Adrian Likins <alikins@redhat.com> | 2008-11-13 17:14:39 -0500 |
|---|---|---|
| committer | Adrian Likins <alikins@redhat.com> | 2008-11-13 17:14:39 -0500 |
| commit | 5f975a37d7c6523e0e8bdc4ea54ec87038752c08 (patch) | |
| tree | 3c5b84b4deb67b91425f174994b95432df56c361 | |
| parent | 78c1380c39b2f2630addb5bacf588f3b0281729b (diff) | |
| download | func-5f975a37d7c6523e0e8bdc4ea54ec87038752c08.tar.gz func-5f975a37d7c6523e0e8bdc4ea54ec87038752c08.tar.xz func-5f975a37d7c6523e0e8bdc4ea54ec87038752c08.zip | |
jbothing.py had a couple of cases of using the wrong "utils" module.
Fix and update.
Also reorder the imports little bit. Just style changes.
| -rw-r--r-- | func/jobthing.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/func/jobthing.py b/func/jobthing.py index d5fc2a8..09a8f8d 100644 --- a/func/jobthing.py +++ b/func/jobthing.py @@ -14,17 +14,18 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +import dbm +import fcntl import os -import random # for testing only -import time # for testing only +import pprint import shelve -import dbm import sys -import fcntl +import time + import forkbomb -import utils -import pprint from func.CommonErrors import * +from func import utils +from certmaster import utils as cm_utils JOB_ID_RUNNING = 0 JOB_ID_FINISHED = 1 @@ -202,7 +203,7 @@ def minion_async_run(retriever, method, args): rc = function_ref(*args) except Exception, e: (t, v, tb) = sys.exc_info() - rc = utils.nice_exception(t,v,tb) + rc = cm_utils.nice_exception(t,v,tb) __update_status(job_id, JOB_ID_FINISHED, rc) os._exit(0) |