summaryrefslogtreecommitdiff
path: root/portato
diff options
context:
space:
mode:
authorNecoro <>2008-01-28 19:43:34 +0000
committerNecoro <>2008-01-28 19:43:34 +0000
commitc2259ceb0b211c148dab20ac484509d24b791bae (patch)
tree739c74b4b942ce569eeba89cb605854f62330f4a /portato
parent43bb555d0925f447a89b0e3559d63704e4bafea0 (diff)
downloadportato-c2259ceb0b211c148dab20ac484509d24b791bae.tar.gz
portato-c2259ceb0b211c148dab20ac484509d24b791bae.tar.bz2
portato-c2259ceb0b211c148dab20ac484509d24b791bae.zip
From 0.9.0 branch.
Diffstat (limited to 'portato')
-rw-r--r--portato/gui/gtk/views.py1
-rw-r--r--portato/gui/gui_helper.py4
-rw-r--r--portato/gui/templates/portato.glade3
3 files changed, 5 insertions, 3 deletions
diff --git a/portato/gui/gtk/views.py b/portato/gui/gtk/views.py
index db1f054..8a73bab 100644
--- a/portato/gui/gtk/views.py
+++ b/portato/gui/gtk/views.py
@@ -18,6 +18,7 @@ import gtk
import logging
from gettext import lgettext as _
+from ...helper import warning
class LazyView (object):
def __init__ (self):
diff --git a/portato/gui/gui_helper.py b/portato/gui/gui_helper.py
index c6e6247..91a460f 100644
--- a/portato/gui/gui_helper.py
+++ b/portato/gui/gui_helper.py
@@ -506,7 +506,7 @@ class EmergeQueue:
self.process = Popen(command+options+packages, shell = False, env = system.get_environment(), preexec_fn = pre)
# remove packages from queue
- if self.tree and it:
+ if self.tree and it and not self.tree.is_in_unmerge(top):
self.up = Updater(self, it, self.threadClass)
else:
self.up = None
@@ -528,6 +528,8 @@ class EmergeQueue:
self.tree.set_in_progress(top, False)
else:
self.remove(top)
+ elif self.tree and it:
+ self.remove_with_children(top)
if self.title_update: self.title_update(None)
diff --git a/portato/gui/templates/portato.glade b/portato/gui/templates/portato.glade
index 335eca0..60047c7 100644
--- a/portato/gui/templates/portato.glade
+++ b/portato/gui/templates/portato.glade
@@ -2113,8 +2113,7 @@ Thanks goto:
- The Porthole team, which often inspired me and gave me hints :)
- franzf, who often tested and gave comments
- the Sabayon-Distro for making Portato the default Portage-GUI</property>
- <property name="translator_credits">Catalan - Roger Calvó
-German - René 'Necoro' Neumann
+ <property name="translator_credits">German - René 'Necoro' Neumann
Polish - Tomasz Osiński</property>
<property name="artists">p4r4d0x (inspired by wolfden)</property>
<signal name="response" handler="close"/>