From 421b65ab3a6d9e73ca8afe26bdece174aa8f3d0f Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Tue, 19 Nov 2013 21:19:27 +0100 Subject: [PATCH] [eit.commands.commit] use map() instead of filter() in installed packages scan --- server/eit/commands/commit.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/server/eit/commands/commit.py b/server/eit/commands/commit.py index b4cb8ed83..7d18015db 100644 --- a/server/eit/commands/commit.py +++ b/server/eit/commands/commit.py @@ -472,9 +472,9 @@ If you would like to selectively add certain packages, please see def pkg_filter(spm_name): if spm_name in to_be_added: - return True + return spm_name try: - inst_spm_name = entropy_server.Spm( + return entropy_server.Spm( ).match_installed_package(spm_name) except KeyError: entropy_server.output( @@ -484,13 +484,14 @@ If you would like to selectively add certain packages, please see header=darkred(" !!! "), importance=1, level="warning") - return False + return None if inst_spm_name in to_be_added: - return True - return False + return inst_spm_name + return None - to_be_added = set(filter(pkg_filter, self._packages)) + to_be_added = set(map(pkg_filter, self._packages)) + to_be_added.discard(None) if not (to_be_removed or to_be_added or to_be_injected): entropy_server.output(