From 0538f7193a16e86751e2e0ae865c4361fd1d4f94 Mon Sep 17 00:00:00 2001
From: René 'Necoro' Neumann <necoro@necoro.net>
Date: Wed, 16 Jul 2008 14:39:10 +0200
Subject: Fixed the update_world with sets for <portage-2.2

---
 portato/gui/queue.py        |  2 +-
 portato/gui/windows/main.py | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'portato')

diff --git a/portato/gui/queue.py b/portato/gui/queue.py
index 8b5a8dc..b5fb736 100644
--- a/portato/gui/queue.py
+++ b/portato/gui/queue.py
@@ -514,7 +514,7 @@ class EmergeQueue:
 		else:
 			it = {}
 
-		self.doEmerge(opts, sets, it, caller = self.update_world)
+		self.doEmerge(opts, list(sets), it, caller = self.update_world)
 
 	def sync (self, command = None):
 		"""Calls "emerge --sync".
diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py
index a68fe17..f5b5d17 100644
--- a/portato/gui/windows/main.py
+++ b/portato/gui/windows/main.py
@@ -1420,13 +1420,14 @@ class MainWindow (Window):
 			watch = gtk.gdk.Cursor(gtk.gdk.WATCH)
 			self.window.window.set_cursor(watch)
 			try:
-				self.updateSets = ("world", "system") # default
 				if system.has_set_support():
 					confsets = [x.strip() for x in self.cfg.get("updatesets").split(",")]
-					syssets = system.get_sets()
-					self.updateSets = [s for s in confsets if s in syssets]
-
-				updating = system.update_world(sets = self.updateSets, newuse = self.cfg.get_boolean("newuse"), deep = self.cfg.get_boolean("deep"))
+					self.updateSets = [s for s in confsets if s in system.get_sets()]
+					updating = system.update_world(sets = self.updateSets, newuse = self.cfg.get_boolean("newuse"), deep = self.cfg.get_boolean("deep"))
+				else:
+					updating = system.update_world(newuse = self.cfg.get_boolean("newuse"), deep = self.cfg.get_boolean("deep"))
+					self.updateSets = ("world",)
+				
 				debug("updating list: %s --> length: %s", [(x.get_cpv(), y.get_cpv()) for x,y in updating], len(updating))
 				gobject.idle_add(cb_idle_append, updating)
 			finally:
-- 
cgit v1.2.3-54-g00ecf