summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornecoro <>2006-10-14 22:03:55 +0000
committernecoro <>2006-10-14 22:03:55 +0000
commitd7f6eeadf843200a56cf21a018fc2a5afc8c7bcb (patch)
treef421d47f2f4cf39fe8f02e7a10c90c19e310d941
parent4fa2a0a7490c38f3362c6ba21b5b73db9624ffa0 (diff)
downloadportato-d7f6eeadf843200a56cf21a018fc2a5afc8c7bcb.tar.gz
portato-d7f6eeadf843200a56cf21a018fc2a5afc8c7bcb.tar.bz2
portato-d7f6eeadf843200a56cf21a018fc2a5afc8c7bcb.zip
Wah - I'm tired ...
Diffstat (limited to '')
-rw-r--r--geneticone/gui/gui_helper.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/geneticone/gui/gui_helper.py b/geneticone/gui/gui_helper.py
index d3a6f5f..08d1926 100644
--- a/geneticone/gui/gui_helper.py
+++ b/geneticone/gui/gui_helper.py
@@ -377,7 +377,7 @@ class EmergeQueue:
else: # unmerge
self.unmergequeue.append(cpv)
if self.unmergeIt: # update tree
- self.tree.append(self.unmergeIt, [cpv])
+ self.tree.append(self.unmergeIt, [cpv, ""])
def _queue_append (self, cpv, oneshot = False):
"""Convenience function appending a cpv either to self.mergequeue or to self.oneshotmerge.
@@ -458,7 +458,7 @@ class EmergeQueue:
# oneshot-queue
if len(self.oneshotmerge) != 0:
# prepare package-list for oneshot
- list, its = prepare()
+ list, its = prepare(self.oneshotmerge)
s = ["--oneshot"]
if not force: s += ["--verbose", "--pretend"]
@@ -468,7 +468,7 @@ class EmergeQueue:
# normal queue
if len(self.mergequeue) != 0:
# prepare package-list
- list, its = prepare()
+ list, its = prepare(self.mergequeue)
s = []
if not force: s = ["--verbose", "--pretend"]
/td> r686@Devoty: necoro | 2008-01-20 04:50:27 +0100Necoro1-2/+3 2008-01-20 r682@Devoty: necoro | 2008-01-20 03:23:02 +0100Necoro2-5/+5 2008-01-20 r680@Devoty: necoro | 2008-01-20 02:53:30 +0100Necoro7-55/+100 2008-01-19 r675@Devoty: necoro | 2008-01-19 23:33:38 +0100Necoro2-366/+396 2008-01-18 r669@Devoty: necoro | 2008-01-18 22:49:33 +0100Necoro1-6/+6 2008-01-18 r664@Devoty: necoro | 2008-01-18 21:40:29 +0100Necoro5-26/+181 2008-01-18 r661@Devoty: necoro | 2008-01-18 14:16:59 +0100Necoro8-211/+293 2008-01-18 r655@Devoty: necoro | 2008-01-18 03:04:53 +0100Necoro1-1/+1 2008-01-18 r651@Devoty: necoro | 2008-01-18 02:41:51 +0100Necoro3-393/+513 2008-01-18 r643@Devoty: necoro | 2008-01-16 18:55:49 +0100Necoro14-249/+525 2008-01-14 r634@Devoty: necoro | 2008-01-14 23:48:24 +0100Necoro3-1/+4 2008-01-14 r632@Devoty: necoro | 2008-01-14 23:44:52 +0100Necoro3-175/+181 2008-01-14(no commit message)Necoro10-758/+1014 2008-01-14 r621@Devoty: necoro | 2008-01-14 20:21:40 +0100Necoro2-21/+61 2008-01-14 r618@Devoty: necoro | 2008-01-14 20:19:05 +0100Necoro2-35/+57 2008-01-14 r617@Devoty: necoro | 2008-01-14 19:12:59 +0100Necoro2-10/+10 2008-01-14 r609@Devoty: necoro | 2008-01-14 17:04:38 +0100Necoro9-394/+477 2008-01-14 r605@Devoty: necoro | 2008-01-14 11:43:34 +0100Necoro2-26/+129 2008-01-14 r603@Devoty: necoro | 2008-01-14 11:30:26 +0100Necoro4-26/+38 2008-01-11 r598@Devoty: necoro | 2008-01-10 16:36:29 +0100Necoro4-10/+50 2008-01-11 r597@Devoty: necoro | 2008-01-10 14:12:35 +0100Necoro1-3/+3 2008-01-10 r595@Devoty: necoro | 2008-01-10 04:04:15 +0100Necoro1-52/+3 2008-01-09 r586@Devoty: necoro | 2008-01-09 14:54:18 +0100Necoro1-1/+1 2007-12-06 r577@Devoty: necoro | 2007-12-06 20:37:36 +0100Necoro1-1/+1 2007-12-06 r572@Devoty: necoro | 2007-11-28 08:48:15 +0100Necoro1-0/+1 2007-11-27 r570@Devoty: necoro | 2007-11-27 02:08:21 +0100Necoro3-84/+108