[master 2/4] Use the correct path for ui categories

atodorov installerbot-noreply at redhat.com
Wed Nov 4 15:38:49 UTC 2015


From: Alexander Todorov <atodorov at redhat.com>

This makes it possible to execute ./anaconda from a git checkout.
The problem is that paths looked like ./pyanaconda/ui/<intf>/ while
they should be ./pyanaconda/ui/. This is not a problem when running
/usr/sbin/anaconda because the defaults provided by getsitepackages()
make it possible to correctly initialize the UI.

Related: rhbz#1276372
---
 pyanaconda/ui/gui/__init__.py | 2 +-
 pyanaconda/ui/tui/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/ui/gui/__init__.py b/pyanaconda/ui/gui/__init__.py
index e91f068..0107e93 100644
--- a/pyanaconda/ui/gui/__init__.py
+++ b/pyanaconda/ui/gui/__init__.py
@@ -633,7 +633,7 @@ def __init__(self, storage, payload, instclass,
         ANACONDA_WINDOW_GROUP.add_window(self.mainWindow)
 
     basemask = "pyanaconda.ui"
-    basepath = os.path.dirname(__file__)
+    basepath = os.path.dirname(os.path.dirname(__file__))
     updatepath = "/tmp/updates/pyanaconda/ui"
     sitepackages = [os.path.join(dir, "pyanaconda", "ui")
                     for dir in site.getsitepackages()]
diff --git a/pyanaconda/ui/tui/__init__.py b/pyanaconda/ui/tui/__init__.py
index bb435c9..32b30d3 100644
--- a/pyanaconda/ui/tui/__init__.py
+++ b/pyanaconda/ui/tui/__init__.py
@@ -104,7 +104,7 @@ def __init__(self, storage, payload, instclass,
         self.quitMessage = quitMessage
 
     basemask = "pyanaconda.ui"
-    basepath = os.path.dirname(__file__)
+    basepath = os.path.dirname(os.path.dirname(__file__))
     updatepath = "/tmp/updates/pyanaconda/ui"
     sitepackages = [os.path.join(dir, "pyanaconda", "ui")
                     for dir in site.getsitepackages()]


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/0358a6de403c69ef39d6b837389bdbc26d0629c8


More information about the anaconda-patches mailing list