diff options
| author | Martin Sivak <msivak@redhat.com> | 2012-10-08 18:02:46 +0200 |
|---|---|---|
| committer | Martin Sivak <msivak@redhat.com> | 2012-10-08 18:02:46 +0200 |
| commit | a633e4ab9ce969f49339fc4d2db998e7e8c93455 (patch) | |
| tree | 1214627d780cd932b3da4373f14747a2a5cfdd12 | |
| parent | 3fcfb82d244119d5f1599f077fc18b35291627b5 (diff) | |
| download | firstboot2-a633e4ab9ce969f49339fc4d2db998e7e8c93455.tar.gz firstboot2-a633e4ab9ce969f49339fc4d2db998e7e8c93455.tar.xz firstboot2-a633e4ab9ce969f49339fc4d2db998e7e8c93455.zip | |
Update the paths mechanism to match Anaconda changes
| -rw-r--r-- | firstboot/gui/gui.py | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/firstboot/gui/gui.py b/firstboot/gui/gui.py index 143f91c..e830a9f 100644 --- a/firstboot/gui/gui.py +++ b/firstboot/gui/gui.py @@ -28,17 +28,10 @@ class FirstbootGraphicalUserInterface(GraphicalUserInterface): def _list_hubs(self): return [FirstbootHub] - @property - def basemask(self): - return "firstboot.gui" + basemask = "firstboot.gui" + basepath = os.path.dirname(__file__) + paths = GraphicalUserInterface.paths + { + "spokes": [(basemask + ".spokes.%s", os.path.join(basepath, "spokes"))], + "categories": [(basemask + ".categories.%s", os.path.join(basepath, "categories"))], + } - @property - def paths(self): - firstboot_path = os.path.join(os.path.dirname(__file__), "spokes") - - _anaconda_paths = GraphicalUserInterface.paths.fget(self) - _anaconda_paths["spokes"].append((self.basemask + ".spokes.%s", - os.path.join(self.basepath, "spokes"))) - _anaconda_paths["categories"].append((self.basemask + ".categories.%s", - os.path.join(self.basepath, "categories"))) - return _anaconda_paths |