From 8f2cf0bbd5b6224be7d8b08f5744ea86b5696f3d Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@cd1c1023-2f26-0410-ae45-c471fc1f0318> Date: Thu, 7 Feb 2008 22:00:30 +0000 Subject: [PATCH] - updated TODO - fixed calculate_world_dependencies with masked packages installed git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1170 cd1c1023-2f26-0410-ae45-c471fc1f0318 --- TODO | 1 + libraries/entropy.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/TODO b/TODO index e283e1693..a394fc52f 100644 --- a/TODO +++ b/TODO @@ -4,6 +4,7 @@ TODO list: - migrate server code to ServerInterface [] write a tool that helps keeping packages updated (also supporting injected ones) [] complete reagent spm interface + - implement configuration files snapshot tool - packages.sabayonlinux.org interactivity (comments + images upload + connection to phpbb user db) - Community repositories - separate packages by license restrictions diff --git a/libraries/entropy.py b/libraries/entropy.py index 5cb5f7544..55454d774 100644 --- a/libraries/entropy.py +++ b/libraries/entropy.py @@ -1608,7 +1608,10 @@ class EquoInterface(TextInterface): #matchatom = mdbconn.retrieveAtom(matchresults[0]) update.add(matchresults) else: - remove.add(idpackage) + # don't take action if it's just masked + maskedresults = self.atomMatch(myscopedata[1]+"/"+myscopedata[2], matchSlot = myscopedata[4], matchBranches = (branch,), packagesFilter = False) + if maskedresults[0] == -1: + remove.add(idpackage) # look for packages that would match key with any slot (for eg, gcc updates), slot changes handling matchresults = self.atomMatch(myscopedata[1]+"/"+myscopedata[2], matchBranches = (branch,)) if matchresults[0] != -1: