From d95c6ba6926e295d7be1a7fe0803780fa0113e0a Mon Sep 17 00:00:00 2001 From: lxnay Date: Thu, 24 Apr 2008 09:57:38 +0000 Subject: [PATCH] Entropy/EquoInterface: - updated TODO - fix caching on Live systems git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1848 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- TODO | 3 +++ libraries/entropy.py | 14 ++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/TODO b/TODO index 9065bf8b8..1fe3d3851 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,8 @@ TODO list - add i18n support + - server-side: improve RDEPEND check output + - server-side: add libtest to reagent + - server-side: make reagent deptest a blocker to db commits - server-side: write a ncurses interface to manage entropy database + spm interface + GLSA - server-side: check rdepend function with pandodl - server-side: move officialrepositoryid settings away from repositories.conf diff --git a/libraries/entropy.py b/libraries/entropy.py index 732080c31..b4593f8d5 100644 --- a/libraries/entropy.py +++ b/libraries/entropy.py @@ -101,8 +101,7 @@ class EquoInterface(TextInterface): # are we running on a livecd? (/proc/cmdline has "cdroot") if self.entropyTools.islive(): self.xcache = False - - if (not self.entropyTools.is_user_in_entropy_group()) and not user_xcache: + elif (not self.entropyTools.is_user_in_entropy_group()) and not user_xcache: self.xcache = False elif not user_xcache: self.validate_repositories_cache() @@ -2241,10 +2240,13 @@ class EquoInterface(TextInterface): def retrieveRemovalQueue(self, idpackages, deep = False): queue = [] - treeview = self.generate_depends_tree(idpackages, deep = deep) - for x in range(len(treeview[0]))[::-1]: - for y in treeview[0][x]: - queue.append(y) + if not idpackages: + return queue + treeview, status = self.generate_depends_tree(idpackages, deep = deep) + if status == 0: + for x in range(len(treeview))[::-1]: + for y in treeview[x]: + queue.append(y) return queue def retrieveInstallQueue(self, matched_atoms, empty_deps, deep_deps):