From e79f576c2edc3dfd329e65cccb69bc9d03a191c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dato=20Sim=C3=B3?= <dato@google.com> Date: Wed, 12 Dec 2012 12:42:15 +0000 Subject: [PATCH] Loader.hs: rewrite extractExTags to use chompPrefix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Dato SimΓ³ <dato@google.com> Reviewed-by: Iustin Pop <iustin@google.com> --- src/Ganeti/HTools/Loader.hs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Ganeti/HTools/Loader.hs b/src/Ganeti/HTools/Loader.hs index 6be17c1ef..30f97bff9 100644 --- a/src/Ganeti/HTools/Loader.hs +++ b/src/Ganeti/HTools/Loader.hs @@ -42,6 +42,7 @@ module Ganeti.HTools.Loader import Data.List import qualified Data.Map as M +import Data.Maybe import Text.Printf (printf) import qualified Ganeti.HTools.Container as Container @@ -185,9 +186,7 @@ longestDomain (x:xs) = -- | Extracts the exclusion tags from the cluster configuration. extractExTags :: [String] -> [String] -extractExTags = - map (drop (length exTagsPrefix)) . - filter (isPrefixOf exTagsPrefix) +extractExTags = filter (not . null) . mapMaybe (chompPrefix exTagsPrefix) -- | Extracts the common suffix from node\/instance names. commonSuffix :: Node.List -> Instance.List -> String -- GitLab