Author: Stefano Rivera <stefano@rivera.za.net>
Description: We use a private Python module directory, patch it into sys.path
 at the start of the binaries.
Forwarded: not-needed
Last-Update: 2010-06-27

---
 disk-manager-root.in |   10 +---------
 disk-manager.in      |    8 +-------
 2 files changed, 2 insertions(+), 16 deletions(-)

--- disk-manager.orig/disk-manager-root.in
+++ disk-manager/disk-manager-root.in
@@ -26,15 +26,7 @@ import sys
 import gettext
 from subprocess import *
 
-# Hack to make sure that path is set correctly when installation is in /usr/local
-if "/usr/local" in sys.argv[0] :
-    for path in sys.path :
-        if "/usr/lib/python" in path :
-            local_path = path.replace("/usr", "/usr/local")
-            if not local_path in sys.path :
-                sys.path.append(path.replace("/usr", "/usr/local"))
-    if not "/usr/local/bin" in os.environ["PATH"] :
-        os.environ["PATH"] += ":/usr/local/bin"
+sys.path.insert(0, '/usr/share/disk-manager')
 
 from DiskManager.Fstab.FstabDialogs import dialog
 from DiskManager.config import *
--- disk-manager.orig/disk-manager.in
+++ disk-manager/disk-manager.in
@@ -29,13 +29,7 @@ from gettext import gettext as _
 
 import gtk
 
-# Hack to make sure that path is set correctly when installation is in /usr/local
-if "/usr/local" in sys.argv[0] :
-    for path in sys.path :
-        if "/usr/lib/python" in path :
-            local_path = path.replace("/usr", "/usr/local")
-            if not local_path in sys.path :
-                sys.path.append(path.replace("/usr", "/usr/local"))
+sys.path.insert(0, '/usr/share/disk-manager')
 
 from DiskManager.DiskManager import *
 from DiskManager.Config import Config