mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

make commented out lines always give the default, not a suggested setting

Browse source
This commit is contained in:
Joey Hess 2014-07-11 14:30:36 -04:00
parent e8845fc9b5
commit c5df45999f
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Command/Vicfg.hs
View file

@ -139,9 +139,11 @@ genCfg cfg descs = unlines $ intercalate [""]
grouplist = unwords $ map fromStandardGroup [minBound..] grouplist = unwords $ map fromStandardGroup [minBound..]
preferredcontent = settings cfg descs cfgPreferredContentMap 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) (\(s, u) -> line "wanted" u s)
(\u -> line "wanted" u "standard") (\u -> line "wanted" u "")
requiredcontent = settings cfg descs cfgRequiredContentMap requiredcontent = settings cfg descs cfgRequiredContentMap
[ com "Repository required contents" ] [ com "Repository required contents" ]
@ -153,7 +155,7 @@ genCfg cfg descs = unlines $ intercalate [""]
, com "(Used by repositories with \"groupwanted\" in their preferred contents)" , com "(Used by repositories with \"groupwanted\" in their preferred contents)"
] ]
(\(s, g) -> gline g s) (\(s, g) -> gline g s)
(\g -> gline g "standard") (\g -> gline g "")
where where
gline g value = [ unwords ["groupwanted", g, "=", value] ] gline g value = [ unwords ["groupwanted", g, "=", value] ]
allgroups = S.unions $ stdgroups : M.elems (cfgGroupMap cfg) allgroups = S.unions $ stdgroups : M.elems (cfgGroupMap cfg)