On Thu, Jun 12, 2014 at 04:37:45PM -0700, Brian C. Lane wrote:
The gui/tui part of the path is added below so the system path
should
end at "ui"
---
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 917e0a3..3f1bab2 100644
--- a/pyanaconda/ui/gui/__init__.py
+++ b/pyanaconda/ui/gui/__init__.py
@@ -261,7 +261,7 @@ class GraphicalUserInterface(UserInterface):
basemask = "pyanaconda.ui"
basepath = os.path.dirname(__file__)
updatepath = "/tmp/updates/pyanaconda/ui"
- sitepackages = [os.path.join(dir, "pyanaconda", "ui",
"gui")
+ sitepackages = [os.path.join(dir, "pyanaconda", "ui")
for dir in site.getsitepackages()]
pathlist = set([updatepath, basepath] + sitepackages)
diff --git a/pyanaconda/ui/tui/__init__.py b/pyanaconda/ui/tui/__init__.py
index 89c3f30..655913a 100644
--- a/pyanaconda/ui/tui/__init__.py
+++ b/pyanaconda/ui/tui/__init__.py
@@ -100,7 +100,7 @@ class TextUserInterface(ui.UserInterface):
basemask = "pyanaconda.ui"
basepath = os.path.dirname(__file__)
updatepath = "/tmp/updates/pyanaconda/ui"
- sitepackages = [os.path.join(dir, "pyanaconda", "ui",
"tui")
+ sitepackages = [os.path.join(dir, "pyanaconda", "ui")
for dir in site.getsitepackages()]
pathlist = set([updatepath, basepath] + sitepackages)
--
1.9.3
I'm going to ack my own patch and do a build. Tested it via
rd.break=switch-root since using a updates.img puts the correct paths
into /tmp/updates/ which is why testing the other patches seemed to work
fine.
--
Brian C. Lane | Anaconda Team | IRC: bcl #anaconda | Port Orchard, WA (PST8PDT)