Merge branch 'unduping_code'

2 files changed, 3 insertions, 2 deletions

diff --git a/funcweb/Makefile b/funcweb/Makefile
index d9a865a..4d1e644 100755
--- a/funcweb/Makefile
+++ b/funcweb/Makefile
@@ -26,6 +26,7 @@ clean:
 	-rm -rf dist/
 	-rm -rf *~
 	-rm -rf rpm-build/
+	-rm -rf funcweb.egg-info/
 	-for d in $(DIRS); do ($(MAKE) -C $$d clean ); done
 
 clean_hard:
diff --git a/funcweb/funcweb/commands.py b/funcweb/funcweb/commands.py
index 154309a..cfd76d1 100644
--- a/funcweb/funcweb/commands.py
+++ b/funcweb/funcweb/commands.py
@@ -11,7 +11,7 @@ pkg_resources.require("TurboGears")
 
 import turbogears
 import cherrypy
-import func.utils as futils
+from certmaster import utils
 
 cherrypy.lowercase_api = True
 
@@ -59,7 +59,7 @@ def start():
     from funcweb.controllers import Root
     
     if exists("/etc/funcweb/prod.cfg"):
-        futils.daemonize("/var/run/funcwebd.pid")
+        utils.daemonize("/var/run/funcwebd.pid")
     #then start the server
     try:
         turbogears.start_server(Root())