From 04d14ebb26e4aafb5ccc9b2ede873fc4136f8548 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 6 May 2010 20:41:10 +0200 Subject: [PATCH] [entropy.tools] improve remove_usedeps --- libraries/entropy/tools.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/libraries/entropy/tools.py b/libraries/entropy/tools.py index 2259eddf1..3d1c71c9e 100644 --- a/libraries/entropy/tools.py +++ b/libraries/entropy/tools.py @@ -1826,16 +1826,18 @@ def remove_usedeps(depend): @return: @rtype: """ - mydepend = depend[:] + new_depend = "" + skip = 0 + for char in depend: + if char == "[": + skip += 1 + elif char == "]": + skip -= 1 + continue + if skip == 0: + new_depend += char - close_bracket = mydepend.find(']') - after_closebracket = '' - if close_bracket != -1: after_closebracket = mydepend[close_bracket+1:] - - open_bracket = mydepend.find('[') - if open_bracket != -1: mydepend = mydepend[:open_bracket] - - return mydepend+after_closebracket + return new_depend def remove_slot(mydep): """