cloud-init-dev team mailing list archive

[Chad Smith <chad.smith@xxxxxxxxxxxxx>]

Diff comments:

> diff --git a/cloudinit/cmd/main.py b/cloudinit/cmd/main.py
> index 30b37fe..e017ca8 100644
> --- a/cloudinit/cmd/main.py
> +++ b/cloudinit/cmd/main.py
> @@ -417,11 +417,17 @@ def main_init(name, args):
>  
>  
>  def di_report_warn(datasource, cfg):
> -    if 'di_report' not in cfg:
> +    if 'di_report' not in cfg or cfg.get('di_report') is None:
>          LOG.debug("no di_report found in config.")
>          return
>  
>      dicfg = cfg.get('di_report', {})
> +    if dicfg is None:

Hrm, I don't think we can get here right, we check cfg.get('di_report') is None above.

> +        # ds-identify may write 'di_report:\n #comment\n'
> +        # which reads as {'di_report': None}
> +        LOG.debug("di_report was None.")
> +        return
> +
>      if not isinstance(dicfg, dict):
>          LOG.warning("di_report config not a dictionary: %s", dicfg)
>          return


-- 
https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/335956
Your team cloud-init commiters is requested to review the proposed merge of ~smoser/cloud-init:bug/1742479-no-manual_cache_clean-warning into cloud-init:master.