summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/Changelog3
-rw-r--r--portato/gui/gtk/windows.py8
-rw-r--r--portato/gui/gui_helper.py14
3 files changed, 20 insertions, 5 deletions
diff --git a/doc/Changelog b/doc/Changelog
index 4638541..d9cb6e9 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+0.8.1:
+- bugfixes
+
0.8.0:
- removed Qt-Frontend
- added "shutdown" plugin
diff --git a/portato/gui/gtk/windows.py b/portato/gui/gtk/windows.py
index c5e6cf3..8cf9fb7 100644
--- a/portato/gui/gtk/windows.py
+++ b/portato/gui/gtk/windows.py
@@ -554,7 +554,7 @@ class PackageTable:
self.unmergeBtn.set_sensitive(False)
# current status
- self.cb_vers_list_changed(None)
+ self.cb_vers_list_changed()
self.table.show_all()
def hide (self):
@@ -694,7 +694,7 @@ class PackageTable:
error("Package could not be found: %s", e[0])
#masked_dialog(e[0])
- def cb_vers_list_changed (self, treeselection):
+ def cb_vers_list_changed (self, *args):
pkg = self.actual_package()
@@ -780,7 +780,9 @@ class PackageTable:
self.actual_package().remove_new_use_flags()
self.actual_package().remove_new_masked()
self.actual_package().remove_new_testing()
- self.cb_combo_changed(self.vCombo)
+ self.versList.get_model().clear()
+ self.fill_vers_list()
+ self.cb_vers_list_changed()
if self.instantChange:
self._update_keywords(True, update = True)
return True
diff --git a/portato/gui/gui_helper.py b/portato/gui/gui_helper.py
index 91d7ba2..5c26f58 100644
--- a/portato/gui/gui_helper.py
+++ b/portato/gui/gui_helper.py
@@ -491,6 +491,16 @@ class EmergeQueue:
@param command: the command to execute - default is "/usr/bin/python /usr/bin/emerge"
@type command: string[]"""
+ if self.process is not None:
+ def wait():
+ while self.process is not None:
+ time.sleep(0.5)
+
+ self._emerge(options, packages, it, command)
+
+ Thread(name="Waiting-Thread", target=wait).start()
+ return
+
@plugin.hook("emerge", packages = packages, command = command, console = self.console, title_update = self.title_update)
def sub_emerge(command):
if command is None:
@@ -532,7 +542,7 @@ class EmergeQueue:
return list, its
# oneshot-queue
- if len(self.oneshotmerge) != 0:
+ if self.oneshotmerge:
# prepare package-list for oneshot
list, its = prepare(self.oneshotmerge)
@@ -543,7 +553,7 @@ class EmergeQueue:
self._emerge(s, list, its)
# normal queue
- if len(self.mergequeue) != 0:
+ if self.mergequeue:
# prepare package-list
list, its = prepare(self.mergequeue)