summaryrefslogtreecommitdiff
path: root/geneticone/gui/gui_helper.py
diff options
context:
space:
mode:
authornecoro <>2006-09-29 20:45:18 +0000
committernecoro <>2006-09-29 20:45:18 +0000
commit702f6a0b7d3799b70ed904e199f4275bc0dc54e2 (patch)
tree35c0f1a8e8b2c34e64beca76976ef3783a7f0f35 /geneticone/gui/gui_helper.py
parent8c0913b9e18be985ab5fb6e99276b44c43ba1a31 (diff)
downloadportato-702f6a0b7d3799b70ed904e199f4275bc0dc54e2.tar.gz
portato-702f6a0b7d3799b70ed904e199f4275bc0dc54e2.tar.bz2
portato-702f6a0b7d3799b70ed904e199f4275bc0dc54e2.zip
fixed bugs
Diffstat (limited to 'geneticone/gui/gui_helper.py')
-rw-r--r--geneticone/gui/gui_helper.py15
1 files changed, 6 insertions, 9 deletions
diff --git a/geneticone/gui/gui_helper.py b/geneticone/gui/gui_helper.py
index abe5106..2f98bd7 100644
--- a/geneticone/gui/gui_helper.py
+++ b/geneticone/gui/gui_helper.py
@@ -12,6 +12,7 @@
from geneticone import backend
from geneticone.backend import flags
from geneticone.helper import *
+import windows
from subprocess import *
from threading import Thread
@@ -56,7 +57,7 @@ class EmergeQueue:
@raise geneticone.BlockedException: When occured during dependency-calculation."""
- # get depencies
+ # get dependencies
if cpv in self.deps:
return # in list already
else:
@@ -64,6 +65,9 @@ class EmergeQueue:
self.deps.update({cpv : deps})
subIt = self.tree.append(it, [cpv])
+
+ # add iter
+ self.iters.update({cpv: subIt})
# recursive call
for d in deps:
@@ -76,8 +80,6 @@ class EmergeQueue:
self.remove_children(subIt)
raise e
- # add iter
- self.iters.update({cpv: subIt})
def append (self, cpv, unmerge = False, update = False):
"""Appends a cpv either to the merge queue or to the unmerge-queue.
@@ -110,7 +112,7 @@ class EmergeQueue:
except backend.BlockedException, e : # there is sth blocked --> call blocked_dialog
blocks = e[0]
- blocked_dialog(cpv, blocks)
+ windows.blocked_dialog(cpv, blocks)
return
else: # unmerge
self.unmergequeue.append(cpv)
@@ -231,8 +233,3 @@ class EmergeQueue:
self.unmergequeue.remove(cpv)
self.tree.remove(it)
-
-def blocked_dialog (blocked, blocks):
- dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, blocked+" is blocked by "+blocks+".\nPlease unmerge the blocking package.")
- dialog.run()
- dialog.destroy()