diff options
| author | Martin Sivak <msivak@redhat.com> | 2012-10-05 12:23:20 +0200 |
|---|---|---|
| committer | Martin Sivak <msivak@redhat.com> | 2012-10-05 12:23:20 +0200 |
| commit | 9f06d0ec64401167f04eacb4c79310f918b4c105 (patch) | |
| tree | 310e90696622b2f7f3cdb41d4f06a1dcdd38beb7 | |
| parent | 85213fb5ba9c2ace55f071ea3e3ef611db625311 (diff) | |
| download | firstboot2-9f06d0ec64401167f04eacb4c79310f918b4c105.tar.gz firstboot2-9f06d0ec64401167f04eacb4c79310f918b4c105.tar.xz firstboot2-9f06d0ec64401167f04eacb4c79310f918b4c105.zip | |
Add overrides paths and update some paths in Makefile
| -rw-r--r-- | firstboot/Makefile | 4 | ||||
| -rw-r--r-- | firstboot/gui/__main__.py | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/firstboot/Makefile b/firstboot/Makefile index f01bf4b..a0fa16d 100644 --- a/firstboot/Makefile +++ b/firstboot/Makefile @@ -25,10 +25,12 @@ rungui: ANACONDA_WIDGETS_OVERRIDES=${ANACONDA_PATH}/widgets/python \ ANACONDA_WIDGETS_DATA=${ANACONDA_PATH}/widgets/data \ ANACONDA_INSTALL_CLASSES=${ANACONDA_PATH}/pyanaconda/installclasses \ - PYTHONPATH=.:${ANACONDA_PATH}:${ANACONDA_PATH}/pyanaconda/isys/.libs:${ANACONDA_PATH}/widgets/python/:${ANACONDA_PATH}/widgets/src/.libs/ \ + PYTHONPATH=.:${ANACONDA_PATH}/pyanaconda/isys/.libs:${ANACONDA_PATH}/widgets/python/:${ANACONDA_PATH}/widgets/src/.libs/:${ANACONDA_PATH} \ LD_LIBRARY_PATH=${ANACONDA_PATH}/widgets/src/.libs \ UIPATH=${ANACONDA_PATH}/pyanaconda/ui/gui/ \ GI_TYPELIB_PATH=${ANACONDA_PATH}/widgets/src/ \ + GLADE_CATALOG_SEARCH_PATH=${ANACONDA_PATH}/widgets/glade \ + GLADE_MODULE_SEARCH_PATH=${ANACONDA_PATH}/widgets/src/.libs \ python -m gui runtui: diff --git a/firstboot/gui/__main__.py b/firstboot/gui/__main__.py index 0006e41..0c5c491 100644 --- a/firstboot/gui/__main__.py +++ b/firstboot/gui/__main__.py @@ -1,5 +1,12 @@ import gui +# We need this so we can tell GI to look for overrides objects +# also in anaconda source directories +import os +import gi.overrides +for p in os.environ.get("ANACONDA_WIDGETS_OVERRIDES", "").split(":"): + gi.overrides.__path__.insert(0, p) + class O(object): pass |