Skip to content

Commit

Permalink
Use the correct path for ui categories
Browse files Browse the repository at this point in the history
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
  • Loading branch information
atodorov committed Nov 4, 2015
1 parent b7665f0 commit 0358a6d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pyanaconda/ui/gui/__init__.py
Expand Up @@ -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()]
Expand Down
2 changes: 1 addition & 1 deletion pyanaconda/ui/tui/__init__.py
Expand Up @@ -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()]
Expand Down

0 comments on commit 0358a6d

Please sign in to comment.