diff options
| author | Necoro <> | 2008-01-23 23:12:52 +0000 |
|---|---|---|
| committer | Necoro <> | 2008-01-23 23:12:52 +0000 |
| commit | fceb850b55ddf4109905ec939f1e8d06ee651f92 (patch) | |
| tree | 1772b93bfad9ad3d62448d7ac91ddb725ae5815c | |
| parent | c2ef204f52a76f529d7ce17d9eb94077a2e15467 (diff) | |
| download | portato-fceb850b55ddf4109905ec939f1e8d06ee651f92.tar.gz portato-fceb850b55ddf4109905ec939f1e8d06ee651f92.tar.bz2 portato-fceb850b55ddf4109905ec939f1e8d06ee651f92.zip | |
r707@Devoty: necoro | 2008-01-24 00:00:22 +0100
small patch for get_actual_use_flag taking into account that a package might not be in system anymore
r708@Devoty: necoro | 2008-01-24 00:11:23 +0100
EmergeQueue.is_empty() now honors all queues
| -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()))) |