summaryrefslogtreecommitdiffstats
path: root/module/InitHomeDir.py
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2012-09-18 17:59:50 +0200
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2012-09-18 17:59:50 +0200
commit6130a2377ca6754fee88773097ce220abef1aa47 (patch)
tree76bea0d76393100fcf393c164c96d34f286aba7a /module/InitHomeDir.py
parentAdded DuckcryptInfo decrypter, smaller fixes (diff)
parentdropdowns in navbar (diff)
downloadpyload-6130a2377ca6754fee88773097ce220abef1aa47.tar.xz
merged stable into default
Diffstat (limited to 'module/InitHomeDir.py')
-rw-r--r--module/InitHomeDir.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/module/InitHomeDir.py b/module/InitHomeDir.py
index 156c9f932..14207847e 100644
--- a/module/InitHomeDir.py
+++ b/module/InitHomeDir.py
@@ -52,7 +52,7 @@ else:
__builtin__.homedir = homedir
-args = " ".join(argv[1:])
+args = " ".join(argv)
# dirty method to set configdir from commandline arguments
if "--configdir=" in args:
@@ -63,6 +63,10 @@ if "--configdir=" in args:
configdir = args[pos + 12:].strip()
else:
configdir = args[pos + 12:end].strip()
+elif "nosetests" in args:
+ print "Running in test mode"
+ configdir = join(pypath, "tests", "config")
+
elif path.exists(path.join(pypath, "module", "config", "configdir")):
f = open(path.join(pypath, "module", "config", "configdir"), "rb")
c = f.read().strip()