[kaya] Use of System.Environment.looupEnv to fix a FTBFS
Jochen Schmitt
s4504kr at fedoraproject.org
Tue Aug 27 16:21:34 UTC 2013
commit 7cf2af089d41b6b81bdc4fe73b2819a5977c673c
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Tue Aug 27 18:21:18 2013 +0200
Use of System.Environment.looupEnv to fix a FTBFS
kaya-0.5.2-catch.patch | 20 +++++++++++---------
kaya.spec | 1 +
2 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/kaya-0.5.2-catch.patch b/kaya-0.5.2-catch.patch
index f5213f8..e25a0c1 100644
--- a/kaya-0.5.2-catch.patch
+++ b/kaya-0.5.2-catch.patch
@@ -1,12 +1,14 @@
-diff -up kaya-0.5.2/compiler/Portability64.hs.bak kaya-0.5.2/compiler/Portability64.hs
---- kaya-0.5.2/compiler/Portability64.hs.bak 2013-08-21 17:34:29.863775562 +0200
-+++ kaya-0.5.2/compiler/Portability64.hs 2013-08-21 17:36:03.425768068 +0200
-@@ -5,6 +5,8 @@ import System.IO
- import System.Environment
- import qualified Data.Map as Map
-
-+import Control.Exception
-+
+diff -up kaya-0.5.2/compiler/Portability64.hs.catch kaya-0.5.2/compiler/Portability64.hs
+--- kaya-0.5.2/compiler/Portability64.hs.catch 2009-04-12 12:02:24.000000000 +0200
++++ kaya-0.5.2/compiler/Portability64.hs 2013-08-27 17:30:21.284064222 +0200
+@@ -8,9 +8,7 @@ import qualified Data.Map as Map
-- GHC 6.4 and above library incompatibilities.
environment :: String -> IO (Maybe String)
+-environment x = catch (do e <- getEnv x
+- return (Just e))
+- (\_ -> return Nothing)
++environment = lookupEnv
+
+ tempfile :: IO (FilePath, Handle)
+ tempfile = do env <- environment "TMPDIR"
diff --git a/kaya.spec b/kaya.spec
index 92fa25b..37e4b66 100644
--- a/kaya.spec
+++ b/kaya.spec
@@ -129,6 +129,7 @@ make test ||:
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
- Remove -fstack-protector-stong, Fix BZ #995626
+- Use of System.Environment.lookupEnv to fix FTBFS
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.2-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list