diff options
| -rw-r--r-- | doc/Changelog | 1 | ||||
| -rw-r--r-- | icons/portato-icon_old.png | bin | 5265 -> 0 bytes | |||
| -rw-r--r-- | portato/backend/portage/system.py | 2 | ||||
| -rw-r--r-- | portato/gui/gtk/windows.py | 4 | ||||
| -rw-r--r-- | portato/gui/gui_helper.py | 1 |
5 files changed, 6 insertions, 2 deletions
diff --git a/doc/Changelog b/doc/Changelog index 54815e0..960f46c 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -2,6 +2,7 @@ next: - "porting" to python-2.5 - adding support for the "--with-bdeps=y" option in EMERGE_DEFAULT_OPTS - fix update world +- added support for pygtksourceview-2 0.8.5: - added an uncaught exception dialog diff --git a/icons/portato-icon_old.png b/icons/portato-icon_old.png Binary files differdeleted file mode 100644 index 59d7441..0000000 --- a/icons/portato-icon_old.png +++ /dev/null diff --git a/portato/backend/portage/system.py b/portato/backend/portage/system.py index 5916a9f..93c5ea0 100644 --- a/portato/backend/portage/system.py +++ b/portato/backend/portage/system.py @@ -19,7 +19,7 @@ import portage from .package import PortagePackage from .settings import PortageSettings from ..system_interface import SystemInterface -from ...helper import debug, info, unique_array +from ...helper import debug, info, warning, unique_array class PortageSystem (SystemInterface): """This class provides access to the portage-system.""" diff --git a/portato/gui/gtk/windows.py b/portato/gui/gtk/windows.py index 7234490..dc3dc35 100644 --- a/portato/gui/gtk/windows.py +++ b/portato/gui/gtk/windows.py @@ -391,6 +391,10 @@ class EbuildWindow (AbstractDialog): else: man = gtksourceview2.LanguageManager() language = man.get_language("ebuild") + + if language is None: + info(_("No ebuild language file installed. Falling back to shell.")) + language = man.get_language("sh") # set buffer and view self.buf = gtksourceview2.Buffer() diff --git a/portato/gui/gui_helper.py b/portato/gui/gui_helper.py index d1c53d0..fb531d7 100644 --- a/portato/gui/gui_helper.py +++ b/portato/gui/gui_helper.py @@ -518,7 +518,6 @@ class EmergeQueue: if self.title_update: self.title_update(None) - if self.process is None: # someone resetted this self.threadQueue.next() return |
