summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-07-11 14:30:36 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-07-11 14:30:36 -0400
commit7adea116842cde90342f72049e44eea3d4dd6453 (patch)
tree1fdabae129b7481347344598e2d99dd7b277770a /Command
parentf6fa35fdfbfba57e4f42bbdb2a63c24903ecc71b (diff)
make commented out lines always give the default, not a suggested setting
Diffstat (limited to 'Command')
-rw-r--r--Command/Vicfg.hs8
1 files changed, 5 insertions, 3 deletions
diff --git a/Command/Vicfg.hs b/Command/Vicfg.hs
index d7d5229da..5ec6bbf72 100644
--- a/Command/Vicfg.hs
+++ b/Command/Vicfg.hs
@@ -139,9 +139,11 @@ genCfg cfg descs = unlines $ intercalate [""]
grouplist = unwords $ map fromStandardGroup [minBound..]
preferredcontent = settings cfg descs cfgPreferredContentMap
- [ com "Repository preferred contents" ]
+ [ com "Repository preferred contents"
+ , com "(Set to \"standard\" to use a repository's group's preferred contents)"
+ ]
(\(s, u) -> line "wanted" u s)
- (\u -> line "wanted" u "standard")
+ (\u -> line "wanted" u "")
requiredcontent = settings cfg descs cfgRequiredContentMap
[ com "Repository required contents" ]
@@ -153,7 +155,7 @@ genCfg cfg descs = unlines $ intercalate [""]
, com "(Used by repositories with \"groupwanted\" in their preferred contents)"
]
(\(s, g) -> gline g s)
- (\g -> gline g "standard")
+ (\g -> gline g "")
where
gline g value = [ unwords ["groupwanted", g, "=", value] ]
allgroups = S.unions $ stdgroups : M.elems (cfgGroupMap cfg)