From 4a6ad17cd7ad5775d76794f1c598e3cbc9bdd2de Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Sun, 9 Jun 2013 22:02:05 +0200
Subject: fixing imports when changing cwd

---
 .gitignore                 | 2 --
 pyload/InitHomeDir.py      | 5 +++++
 pyload/web/webinterface.py | 4 ----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2384b1ff3..2fd96ef0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,12 +55,10 @@ links.txt
 ssl.crt
 ssl.key
 cert.pem
-pyload/web/pyload.db
 *.prefs
 *.po
 *.orig
 *.rej
-pyload/*
 dist/*
 build/*
 env/*
diff --git a/pyload/InitHomeDir.py b/pyload/InitHomeDir.py
index 8fca42196..3554497d3 100644
--- a/pyload/InitHomeDir.py
+++ b/pyload/InitHomeDir.py
@@ -29,6 +29,11 @@ import __builtin__
 __builtin__.owd = path.abspath("") #original working directory
 __builtin__.pypath = path.abspath(path.join(__file__, "..", ".."))
 
+# Before changing the cwd, the abspath of the module must be manifested
+if 'pyload' in sys.modules:
+    sys.modules['pyload'].__path__.append(path.abspath(sys.modules['pyload'].__path__[0]))
+
+
 sys.path.append(join(pypath, "pyload", "lib"))
 
 homedir = ""
diff --git a/pyload/web/webinterface.py b/pyload/web/webinterface.py
index 37d06bd68..cf73827b7 100644
--- a/pyload/web/webinterface.py
+++ b/pyload/web/webinterface.py
@@ -24,10 +24,6 @@ from os.path import join, abspath, dirname
 PROJECT_DIR = abspath(dirname(__file__))
 PYLOAD_DIR = abspath(join(PROJECT_DIR, "..", ".."))
 
-sys.path.append(PYLOAD_DIR)
-
-from pyload import InitHomeDir
-
 import bottle
 from bottle import run, app
 
-- 
cgit v1.2.3