From 67ed3a6231f3f50465c4970c166c834f22359c59 Mon Sep 17 00:00:00 2001
From: Brent Yorgey <byorgey@gmail.com>
Date: Mon, 20 Jul 2015 14:18:40 -0500
Subject: [PATCH] cabal init: generate less for PublicDomain
---
cabal-install/Distribution/Client/Init.hs | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/cabal-install/Distribution/Client/Init.hs b/cabal-install/Distribution/Client/Init.hs
index 7657ab03f0..d0c6869a67 100644
--- a/cabal-install/Distribution/Client/Init.hs
+++ b/cabal-install/Distribution/Client/Init.hs
@@ -116,7 +116,9 @@ initCabal verbosity packageDBs repos comp conf initFlags = do
initFlags' <- extendFlags installedPkgIndex sourcePkgDb initFlags
- writeLicense initFlags'
+ case license initFlags' of
+ Flag PublicDomain -> return ()
+ _ -> writeLicense initFlags'
writeSetupFile initFlags'
writeChangeLog initFlags'
createSourceDirectories initFlags'
@@ -807,9 +809,11 @@ generateCabalFile fileName c =
(Just "The license under which the package is released.")
True
- , fieldS "license-file" (Flag "LICENSE")
- (Just "The file containing the license text.")
- True
+ , case (license c) of
+ Flag PublicDomain -> empty
+ _ -> fieldS "license-file" (Flag "LICENSE")
+ (Just "The file containing the license text.")
+ True
, fieldS "author" (author c)
(Just "The package author(s).")
@@ -819,9 +823,11 @@ generateCabalFile fileName c =
(Just "An email address to which users can send suggestions, bug reports, and patches.")
True
- , fieldS "copyright" NoFlag
- (Just "A copyright notice.")
- True
+ , case (license c) of
+ Flag PublicDomain -> empty
+ _ -> fieldS "copyright" NoFlag
+ (Just "A copyright notice.")
+ True
, fieldS "category" (either id display `fmap` category c)
Nothing
--
GitLab