| 1 |
slyfox 12/07/08 18:13:13 |
| 2 |
|
| 3 |
Added: haskell-updater-1.2.0.5-ghc-7.5.patch |
| 4 |
Log: |
| 5 |
Version bump. With new '--list-only' and '--quiet' options requested by Martin von Gagern in bug #407301 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha116_p2/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-admin/haskell-updater/files/haskell-updater-1.2.0.5-ghc-7.5.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/haskell-updater/files/haskell-updater-1.2.0.5-ghc-7.5.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/haskell-updater/files/haskell-updater-1.2.0.5-ghc-7.5.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: haskell-updater-1.2.0.5-ghc-7.5.patch |
| 16 |
=================================================================== |
| 17 |
--- haskell-updater-1.2.0.5-orig/Distribution/Gentoo/PkgManager.hs 2012-02-12 07:08:49.000000000 +1100 |
| 18 |
+++ haskell-updater-1.2.0.5/Distribution/Gentoo/PkgManager.hs 2012-06-29 22:06:38.858341358 +1000 |
| 19 |
@@ -26,7 +26,7 @@ |
| 20 |
import Data.Maybe(mapMaybe, fromMaybe) |
| 21 |
import qualified Data.Map as M |
| 22 |
import Data.Map(Map) |
| 23 |
-import System.IO.Error(try) |
| 24 |
+import Control.Exception(try, SomeException) |
| 25 |
import System.Environment(getEnv) |
| 26 |
|
| 27 |
-- ----------------------------------------------------------------------------- |
| 28 |
@@ -48,7 +48,7 @@ |
| 29 |
-- "portage". Note that even if that environment variable is |
| 30 |
-- defined, if it is unknown then it won't be used. |
| 31 |
defaultPM :: IO PkgManager |
| 32 |
-defaultPM = do eDPM <- try $ getEnv "PACKAGE_MANAGER" |
| 33 |
+defaultPM = do eDPM <- (try $ getEnv "PACKAGE_MANAGER") :: IO (Either SomeException String) |
| 34 |
let dPM = either (const defaultPMName) id eDPM |
| 35 |
mPM = dPM `M.lookup` pmNameMap |
| 36 |
return $ fromMaybe knownDef mPM |
Archives