From 2e153e632fb89b4cef365f877d8f5ea8cbae09c8 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayonlinux.org>
Date: Tue, 26 May 2009 10:49:49 +0200
Subject: [PATCH] equo, show conflicts in printed queue

---
 client/text_ui.py | 14 +++++++++-----
 docs/TODO         |  8 ++++----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/client/text_ui.py b/client/text_ui.py
index 0e07ae31d..f55946b45 100644
--- a/client/text_ui.py
+++ b/client/text_ui.py
@@ -553,6 +553,7 @@ def _showPackageInfo(foundAtoms, deps):
 def _generateRunQueue(foundAtoms, deps, emptydeps, deepdeps):
 
     runQueue = []
+    removalQueue = []
 
     if deps:
         print_info(red(" @@ ")+blue("%s ...") % (_("Calculating dependencies"),) )
@@ -610,7 +611,7 @@ def _generateRunQueue(foundAtoms, deps, emptydeps, deepdeps):
         for atomInfo in foundAtoms:
             runQueue.append(atomInfo)
 
-    return False, runQueue
+    return False, runQueue, removalQueue
 
 def downloadSources(packages = [], deps = True, deepdeps = False, tbz2 = [],
     savecwd = False):
@@ -624,7 +625,8 @@ def downloadSources(packages = [], deps = True, deepdeps = False, tbz2 = [],
     abort, myrc = _showPackageInfo(foundAtoms, deps)
     if abort: return myrc
 
-    abort, runQueue = _generateRunQueue(foundAtoms, deps, False, deepdeps)
+    abort, runQueue, removalQueue = _generateRunQueue(foundAtoms, deps,
+        False, deepdeps)
     if abort: return runQueue
 
     if etpUi['pretend']:
@@ -655,7 +657,9 @@ def downloadSources(packages = [], deps = True, deepdeps = False, tbz2 = [],
 
     return 0,0
 
-def installPackages(packages = [], atomsdata = [], deps = True, emptydeps = False, onlyfetch = False, deepdeps = False, configFiles = False, tbz2 = [], resume = False, skipfirst = False, dochecksum = True, multifetch = 1):
+def installPackages(packages = [], atomsdata = [], deps = True, emptydeps = False,
+    onlyfetch = False, deepdeps = False, configFiles = False, tbz2 = [],
+    resume = False, skipfirst = False, dochecksum = True, multifetch = 1):
 
     # check if I am root
     if (not Equo.entropyTools.is_root()):
@@ -693,11 +697,11 @@ def installPackages(packages = [], atomsdata = [], deps = True, emptydeps = Fals
             dirscleanup()
             return myrc
 
-        abort, runQueue = _generateRunQueue(foundAtoms, deps, emptydeps, deepdeps)
+        abort, runQueue, removalQueue = _generateRunQueue(foundAtoms, deps,
+            emptydeps, deepdeps)
         if abort:
             dirscleanup()
             return runQueue
-        removalQueue = [] # aka, conflicts
 
 
         if ((not runQueue) and (not removalQueue)):
diff --git a/docs/TODO b/docs/TODO
index 6264e1caa..51544784e 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -4,9 +4,9 @@ Proposed for Entropy 1.0 (before and after) (requires API changes, perhaps):
 
   1.0_beta1:
 
-    - Move Trigger.trigger_configure_boot_grub & friends to ebuild (make Trigger more agnostic)
-        -> next kernel 2.6.30
-        -> split kernel sources from kernel bins?
-
+    - Sulfur: iPhone navigation
     - Documentation + code style cleanup (NLnet Milestone 7)
 
+  1.0_beta2:
+
+    - PackageKit integration