diff options
| -rw-r--r-- | portato/backend/portage/package.py | 2 | ||||
| -rw-r--r-- | portato/gui/gtk/windows.py | 2 | ||||
| -rw-r--r-- | portato/gui/gui_helper.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/portato/backend/portage/package.py b/portato/backend/portage/package.py index 845cc0b..42badbe 100644 --- a/portato/backend/portage/package.py +++ b/portato/backend/portage/package.py @@ -55,7 +55,7 @@ class PortagePackage (Package): self._status = None def _init_settings (self, installed): - inst = installed and self.is_installed() + inst = (installed and self.is_installed()) or (self.is_installed() and not self.is_in_system()) if self._settings_installed is not None and self._settings_installed != inst: self._settings.settings.reset() diff --git a/portato/gui/gtk/windows.py b/portato/gui/gtk/windows.py index 1571fc2..bdd5bfb 100644 --- a/portato/gui/gtk/windows.py +++ b/portato/gui/gtk/windows.py @@ -1651,7 +1651,7 @@ class MainWindow (Window): def cb_delete (self, *args): """Looks whether we really want to quit.""" - self.__save_queue = True + self.__save_queue = False if not self.queue.is_empty(): ret = queue_not_empty_dialog() diff --git a/portato/gui/gui_helper.py b/portato/gui/gui_helper.py index 28463a8..c6e6247 100644 --- a/portato/gui/gui_helper.py +++ b/portato/gui/gui_helper.py @@ -777,4 +777,4 @@ class EmergeQueue: @returns: True if everything is empty and the process is not running. @rtype: bool""" - return not (self.mergequeue or self.unmergequeue or self.oneshotmerge or self.process) + return not (self.process or any(map(len, self.iters.itervalues()))) |