summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimonMarechal <>2017-10-09 07:28:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2017-10-09 07:28:00 (GMT)
commitb20d878cc1be61c0f81877e4d0c591cf0c2dd388 (patch)
treef2982a8e4c95d3158ea67cea03c668fda67cc4b3
parent4f14ae8dc0a84f15496b7daf08220c0fc875088d (diff)
version 1.3.121.3.12
-rw-r--r--CHANGELOG.markdown4
-rw-r--r--Erb/Compute.hs1
-rw-r--r--Puppet/Daemon.hs1
-rw-r--r--language-puppet.cabal4
-rw-r--r--progs/PuppetResources.hs2
5 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
index 2d1fcb7..5eff97f 100644
--- a/CHANGELOG.markdown
+++ b/CHANGELOG.markdown
@@ -1,3 +1,7 @@
+# v1.3.12 (2017/10/09)
+
+* Support for Glob >= 0.9
+
# v1.3.11 (2017/10/07)
* Added yera command
diff --git a/Erb/Compute.hs b/Erb/Compute.hs
index 8f0981d..a3680c8 100644
--- a/Erb/Compute.hs
+++ b/Erb/Compute.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE NamedFieldPuns #-}
module Erb.Compute (
diff --git a/Puppet/Daemon.hs b/Puppet/Daemon.hs
index c8a650d..0d98d84 100644
--- a/Puppet/Daemon.hs
+++ b/Puppet/Daemon.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
{-# LANGUAGE GADTs #-}
{-# LANGUAGE LambdaCase #-}
module Puppet.Daemon (
diff --git a/language-puppet.cabal b/language-puppet.cabal
index 0f7c3cb..95274ed 100644
--- a/language-puppet.cabal
+++ b/language-puppet.cabal
@@ -2,7 +2,7 @@
-- documentation, see http://haskell.org/cabal/users-guide/
name: language-puppet
-version: 1.3.11
+version: 1.3.12
synopsis: Tools to parse and evaluate the Puppet DSL.
description: This is a set of tools that is supposed to fill all your Puppet needs : syntax checks, catalog compilation, PuppetDB queries, simulationg of complex interactions between nodes, Puppet master replacement, and more !
homepage: http://lpuppet.banquise.net/
@@ -195,7 +195,7 @@ executable puppetresources
ghc-options: -Wall -rtsopts -funbox-strict-fields -threaded -with-rtsopts "-A2M" -eventlog
-- ghc-prof-options: -auto-all -caf-all -fprof-auto
build-depends: base
- , Glob < 0.9
+ , Glob
, aeson
, bytestring
, containers
diff --git a/progs/PuppetResources.hs b/progs/PuppetResources.hs
index d06593e..cfe2d59 100644
--- a/progs/PuppetResources.hs
+++ b/progs/PuppetResources.hs
@@ -238,7 +238,7 @@ findDeadCode puppetdir catalogs allfiles = do
-- first collect all files / positions from all the catalogs
let allpositions = Set.fromList $ catalogs ^.. traverse . rpos
-- now find all haskell files
- puppetfiles <- Set.fromList . concat . fst <$> G.globDir [G.compile "**/*.pp"] (puppetdir <> "/modules")
+ puppetfiles <- Set.fromList <$> G.globDir1 (G.compile "**/*.pp") (puppetdir <> "/modules")
let deadfiles = Set.filter ("/manifests/" `isInfixOf`) $ puppetfiles `Set.difference` allfiles
usedfiles = puppetfiles `Set.intersection` allfiles
unless (Set.null deadfiles) $ do