Merge.hs: fix breakage on undesolved depends

Reverts bogus 5fca958 commit. Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
gentoo-haskell · Sep 2, 2013 · 34191c2 · 34191c2
1 parent 8c1b7cd
commit 34191c2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Merge.hs b/Merge.hs
@@ -181,12 +181,12 @@ mergeGenericPackageDescription verbosity overlayPath cat pkgGenericDesc fetch =
       deps1 :: [(Cabal.FlagAssignment, Merge.EDep)]
       deps1  = [ (f `updateFa` fr, genDeps pkgDesc_filtered_bdeps)
                | f <- lflags (Cabal.genPackageFlags pkgGenericDesc)
-               , let Right (pkgDesc1,fr) = GHCCore.finalizePackageDescription f
+               , Right (pkgDesc1,fr) <- [GHCCore.finalizePackageDescription f
                                                                   (GHCCore.dependencySatisfiable pix)
                                                                   (GHCCore.platform)
                                                                   compilerId
                                                                   []
-                                                                  pkgGenericDesc
+                                                                  pkgGenericDesc]
                -- drop circular deps and shipped deps
                , let (ad, _sd, _rd) = genSimple (Cabal.buildDepends pkgDesc1)
                , let pkgDesc_filtered_bdeps = pkgDesc1 { Cabal.buildDepends = ad }