fixed bugs

4 files changed, 23 insertions, 13 deletions

diff --git a/geneticone/backend/__init__.py b/geneticone/backend/__init__.py
index 4f00258..16c3a2e 100644
--- a/geneticone/backend/__init__.py
+++ b/geneticone/backend/__init__.py
@@ -1,4 +1,13 @@
-
+#
+# File: geneticone/backend/__init__.py
+# This file is part of the Genetic/One-Project, a graphical portage-frontend.
+#
+# Copyright (C) 2006 Necoro d.M.
+# This is free software.  You may redistribute copies of it under the terms of
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#
+# Written by Necoro d.M. <necoro@necoro.net>
 
 import sys
 
@@ -18,5 +27,5 @@ vartree = gentoolkit.vartree
 
 # import our packages
 from exceptions import *
-from portage_helper import *
 from package import *
+from portage_helper import *
diff --git a/geneticone/backend/package.py b/geneticone/backend/package.py
index 8803955..20e65fd 100644
--- a/geneticone/backend/package.py
+++ b/geneticone/backend/package.py
@@ -9,10 +9,9 @@
 #
 # Written by Necoro d.M. <necoro@necoro.net>
 
-#from portage_helper import *
-#from exceptions import *
 from geneticone.backend import *
 from geneticone.helper import *
+from portage_helper import *
 import flags
 
 import gentoolkit
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()
diff --git a/geneticone/gui/windows.py b/geneticone/gui/windows.py
index 082454b..7fe7d62 100644
--- a/geneticone/gui/windows.py
+++ b/geneticone/gui/windows.py
@@ -625,3 +625,8 @@ class MainWindow:
 		# now subthreads can run normally, but are not allowed to touch the GUI. If threads should change sth there - use gobject.idle_add().
 		# for more informations on threading and gtk: http://www.async.com.br/faq/pygtk/index.py?req=show&file=faq20.006.htp
 		gtk.main()
+
+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()