summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathanFischoff <>2019-11-30 12:40:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2019-11-30 12:40:00 (GMT)
commit57bd58c0536f3ae999c9d49f4e4f5a7a756aedab (patch)
tree0fb55e29eea9fc2cd4fb015337479e069ee18892
parent0e9282a1beafa92380c1e77fdcd4a181ff6035bb (diff)
version 1.27.0.21.27.0.2
-rw-r--r--CHANGELOG.md3
-rw-r--r--src/Database/Postgres/Temp.hs2
-rw-r--r--src/Database/Postgres/Temp/Internal/Config.hs9
-rw-r--r--tmp-postgres.cabal2
4 files changed, 10 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5071695..05e5620 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
Changelog for tmp-postgres
+1.27.0.2
+ Doc Fixes
+
1.27.0.1
Doc Fixes
diff --git a/src/Database/Postgres/Temp.hs b/src/Database/Postgres/Temp.hs
index a849383..670db31 100644
--- a/src/Database/Postgres/Temp.hs
+++ b/src/Database/Postgres/Temp.hs
@@ -20,7 +20,7 @@ To extend or override the defaults use `withConfig` (or `startConfig`).
All of the command line, environment variables and configuration files
that are generated by default for the respective executables can be
-extended of overriden.
+extended or overriden.
In general @tmp-postgres@ is useful if you want a clean temporary
@postgres@ and do not want to worry about clashing with an existing
diff --git a/src/Database/Postgres/Temp/Internal/Config.hs b/src/Database/Postgres/Temp/Internal/Config.hs
index cfbee20..a7f3040 100644
--- a/src/Database/Postgres/Temp/Internal/Config.hs
+++ b/src/Database/Postgres/Temp/Internal/Config.hs
@@ -384,12 +384,12 @@ rmDirIgnoreErrors mainDir = do
-- seems to fix it. #122
-- TODO come up with a better way to deal with this. Probably
-- need to lock the directories recursively before deleting.
- handle ignoreDirIsMissing $ do
+ handle ignoreDirIsMissing $
try (removePathForcibly mainDir) >>= \case
- Left (_ :: IOError) -> try (removePathForcibly mainDir) >>= \case
- Left (_ :: IOError) -> removePathForcibly mainDir
- Right _ -> pure ()
+ Left (_ :: IOError) -> try (removePathForcibly mainDir) >>= \case
+ Left (_ :: IOError) -> removePathForcibly mainDir
Right _ -> pure ()
+ Right _ -> pure ()
-- | Either remove a 'CTemporary' directory or do nothing to a 'CPermanent'
-- one.
@@ -878,3 +878,4 @@ hostToSocketClass :: String -> DirectoryType
hostToSocketClass hostOrSocketPath = case hostOrSocketPath of
'/' : _ -> Permanent hostOrSocketPath
_ -> Temporary
+
diff --git a/tmp-postgres.cabal b/tmp-postgres.cabal
index 3285a53..5b4d37f 100644
--- a/tmp-postgres.cabal
+++ b/tmp-postgres.cabal
@@ -1,5 +1,5 @@
name: tmp-postgres
-version: 1.27.0.1
+version: 1.27.0.2
synopsis: Start and stop a temporary postgres
description: Start and stop a temporary postgres. See README.md
homepage: https://github.com/jfischoff/tmp-postgres#readme