Note this patch is for branch-2.14, it will probably not apply cleanly to
screened. I propose we pull it anyway and resolve the conflicts.

1 patch for repository http://darcs.net/releases/branch-2.14:

patch 7f9e8d76769e21fde94395a06d2b2a99cb57b5dc
Author: Ben Franksen <[email protected]>
Date:   Wed Feb 19 09:45:56 CET 2020
  * Setup.hs: allow use of darcs as a cabal subproject
  
  Creation and later installation of the man page make sense only if we build
  a darcs executable. When darcs is used as a cabal subproject, only the
  library is built. So when building we check that we have a darcs exe and
  when installing we check that the manpage is actually there.

[Setup.hs: allow use of darcs as a cabal subproject
Ben Franksen <[email protected]>**20200219084556
 Ignore-this: ef91061005ffab74232d7b90cda7063d7c3bfdd926dda7e373bf9b0af5e206c1cc53e66017214bc8
 
 Creation and later installation of the man page make sense only if we build
 a darcs executable. When darcs is used as a cabal subproject, only the
 library is built. So when building we check that we have a darcs exe and
 when installing we check that the manpage is actually there.
] hunk ./Setup.hs 34
- -import Control.Monad ( unless, void )
+import Control.Monad ( unless, void, when )
hunk ./Setup.hs 140
- -  manpageHandle <- openFile manpage WriteMode
- -  void $ runProcess darcs ["help","manpage"]
+  darcsExists <- doesFileExist darcs
+  when darcsExists $ do
+    manpageHandle <- openFile manpage WriteMode
+    void $ runProcess darcs ["help","manpage"]
hunk ./Setup.hs 148
- -installManpage pkg lbi verbosity copy =
+installManpage pkg lbi verbosity copy = do
+  let manpage = buildDir lbi </> "darcs/darcs.1"
+  manpageExists <- doesFileExist manpage
+  when manpageExists $ do

Attachment: setup_hs_-allow-use-of-darcs-as-a-cabal-subproject.dpatch
Description: A darcs patch for your repository!

_______________________________________________
darcs-users mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/darcs-users

Reply via email to