shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

lvmconfig: fix deprecation message

Browse Source 
When lvmconfig --typeconfig full printed a deprecated
entry it would attempt to print a non-existing
deprecation comment resulting in output like:
  # (null)        # This setting is no longer used.
This commit is contained in:
David Teigland 2021-03-02 13:49:41 -06:00
parent aa34da6ecc
commit db4af67b37
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/config/config.c
View File

@ -1708,6 +1708,7 @@ static int _out_prefix_fn(const struct dm_config_node *cn, const char *line, voi
const char *node_type_name = cn->v ? "option" : "section"; const char *node_type_name = cn->v ? "option" : "section";
char path[CFG_PATH_MAX_LEN]; char path[CFG_PATH_MAX_LEN];
char commentline[MAX_COMMENT_LINE+1]; char commentline[MAX_COMMENT_LINE+1];
int is_deprecated = 0;
if (cn->id <= 0) if (cn->id <= 0)
return 1; return 1;
@ -1721,13 +1722,14 @@ static int _out_prefix_fn(const struct dm_config_node *cn, const char *line, voi
cfg_def = cfg_def_get_item_p(cn->id); cfg_def = cfg_def_get_item_p(cn->id);
is_deprecated = _def_node_is_deprecated(cfg_def, out->tree_spec);
if (out->tree_spec->withsummary || out->tree_spec->withcomments) { if (out->tree_spec->withsummary || out->tree_spec->withcomments) {
_cfg_def_make_path(path, sizeof(path), cfg_def->id, cfg_def, 1); _cfg_def_make_path(path, sizeof(path), cfg_def->id, cfg_def, 1);
fprintf(out->fp, "\n"); fprintf(out->fp, "\n");
fprintf(out->fp, "%s# Configuration %s %s.\n", line, node_type_name, path); fprintf(out->fp, "%s# Configuration %s %s.\n", line, node_type_name, path);
if (out->tree_spec->withcomments && if (out->tree_spec->withcomments && is_deprecated && cfg_def->deprecation_comment)
_def_node_is_deprecated(cfg_def, out->tree_spec))
fprintf(out->fp, "%s# %s", line, cfg_def->deprecation_comment); fprintf(out->fp, "%s# %s", line, cfg_def->deprecation_comment);
if (cfg_def->comment) { if (cfg_def->comment) {
@ -1745,7 +1747,7 @@ static int _out_prefix_fn(const struct dm_config_node *cn, const char *line, voi
} }
} }
if (_def_node_is_deprecated(cfg_def, out->tree_spec)) if (is_deprecated)
fprintf(out->fp, "%s# This configuration %s is deprecated.\n", line, node_type_name); fprintf(out->fp, "%s# This configuration %s is deprecated.\n", line, node_type_name);
if (cfg_def->flags & CFG_ADVANCED) if (cfg_def->flags & CFG_ADVANCED)
@ -1773,7 +1775,7 @@ static int _out_prefix_fn(const struct dm_config_node *cn, const char *line, voi
return_0; return_0;
fprintf(out->fp, "%s# Available since version %s.\n", line, version); fprintf(out->fp, "%s# Available since version %s.\n", line, version);
if (_def_node_is_deprecated(cfg_def, out->tree_spec)) { if (is_deprecated) {
if (!_get_config_node_version(cfg_def->deprecated_since_version, version)) if (!_get_config_node_version(cfg_def->deprecated_since_version, version))
return_0; return_0;
fprintf(out->fp, "%s# Deprecated since version %s.\n", line, version); fprintf(out->fp, "%s# Deprecated since version %s.\n", line, version);