summaryrefslogtreecommitdiffstats
path: root/server/server.py
diff options
context:
space:
mode:
authorMichael DeHaan <mdehaan@mdehaan.rdu.redhat.com>2007-09-20 18:07:38 -0400
committerMichael DeHaan <mdehaan@mdehaan.rdu.redhat.com>2007-09-20 18:07:38 -0400
commitfd01ae836bab8c11a2608c1703305b7612309dc5 (patch)
treeb248a6a6fc175348ec77873b4272b3919b030084 /server/server.py
parent71e0f6916f5cc79a135e87475cca654ad9920247 (diff)
parent925e043108e8b8e6859f07611d206701ae2f7424 (diff)
downloadthird_party-func-fd01ae836bab8c11a2608c1703305b7612309dc5.tar.gz
third_party-func-fd01ae836bab8c11a2608c1703305b7612309dc5.tar.xz
third_party-func-fd01ae836bab8c11a2608c1703305b7612309dc5.zip
Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func
Diffstat (limited to 'server/server.py')
-rwxr-xr-xserver/server.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/server/server.py b/server/server.py
index 7b0a1a2..f7370b8 100755
--- a/server/server.py
+++ b/server/server.py
@@ -166,8 +166,6 @@ def main(argv):
"""
- module_path=None
-
for arg in sys.argv:
if arg == "import" or arg == "--import":
prov_obj = provisioning.Provisioning()
@@ -177,13 +175,8 @@ def main(argv):
prov_obj = provisioning.Provisioning()
prov_obj.sync(None, {}) # just for testing
return
- elif arg in ["debug", "--debug", "-d"]:
- # basically, run from the src tree instead of
- # using the installed modules
- module_path="modules/"
- mod_path="server/"
- modules = module_loader.load_modules(module_path=module_path)
+ modules = module_loader.load_modules()
print "modules", modules