summaryrefslogtreecommitdiff
path: root/portato/gui
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2008-07-09 21:49:33 +0200
committerRené 'Necoro' Neumann <necoro@necoro.net>2008-07-09 21:49:33 +0200
commit09f790063e70515fbcb828676f639740b1c67885 (patch)
tree32ba2166c2d786ff969dddf4bfcd8b7882a96ec5 /portato/gui
parent9eb714ea374b04cc8beed223106f1c9615accc60 (diff)
downloadportato-09f790063e70515fbcb828676f639740b1c67885.tar.gz
portato-09f790063e70515fbcb828676f639740b1c67885.tar.bz2
portato-09f790063e70515fbcb828676f639740b1c67885.zip
Make update_world set compatible
Diffstat (limited to '')
-rw-r--r--portato/gui/windows/main.py8
-rw-r--r--portato/gui/windows/preference.py2
2 files changed, 8 insertions, 2 deletions
diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py
index 364810d..8f456d9 100644
--- a/portato/gui/windows/main.py
+++ b/portato/gui/windows/main.py
@@ -1422,7 +1422,13 @@ class MainWindow (Window):
watch = gtk.gdk.Cursor(gtk.gdk.WATCH)
self.window.window.set_cursor(watch)
try:
- updating = system.update_world(newuse = self.cfg.get_boolean("newuse"), deep = self.cfg.get_boolean("deep"))
+ sets = ("world", "system") # default
+ if system.has_set_support():
+ confsets = [x.strip() for x in self.cfg.get("updatesets").split(",")]
+ syssets = system.get_sets()
+ sets = [s for s in confsets if s in syssets]
+
+ updating = system.update_world(sets = sets, newuse = self.cfg.get_boolean("newuse"), deep = self.cfg.get_boolean("deep"))
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:
diff --git a/portato/gui/windows/preference.py b/portato/gui/windows/preference.py
index ae95cc5..8aabbba 100644
--- a/portato/gui/windows/preference.py
+++ b/portato/gui/windows/preference.py
@@ -177,7 +177,7 @@ class PreferenceWindow (AbstractDialog):
enabled = [x.strip() for x in self.cfg.get("updatesets").split(",")]
- for set, descr in system.get_sets():
+ for set, descr in system.get_sets(description = True):
store.append([set in enabled, "<i>%s</i>" % set, descr, set])
tCell = gtk.CellRendererToggle()