curtin-dev team mailing list archive

[Olivier Gayot <mp+437494@xxxxxxxxxxxxxxxxxx>]

The proposal to merge ~ogayot/curtin:curthooks-fix-apt-config-translation into curtin:master has been updated.

Commit message changed to:

apt-config: fix curthooks unconditionally triggering apt-config

The following commit:

  1257a38f translate old curtin apt features to new format

introduced the ability to translate old top level keys related to apt
features (e.g., debconf_selections, apt-proxy, apt-mirrors) to the new
format where they are stored as children of 'apt'.

```
                              apt:
debconf_selections:    =>       debconf_selections:
  foobar                          foobar
```

Sadly, by doing so, it introduced a regression, making curthooks call
apt_config.handle_apt unconditionally.

The curthooks.do_apt_config function only calls apt_config.handle_apt if
the configuration does not contain the 'apt' key or if the 'apt' key has
the value None (i.e., null in YAML). When implementing the translation
from old to new configuration format, we accidentally forced the 'apt'
key to exist and coerced it to dictionary.

This effectively defeats the condition in curthooks.do_apt_config.

Fixed by making sure we only create the apt key if needed when doing the
translation.

For more details, see:
https://code.launchpad.net/~ogayot/curtin/+git/curtin/+merge/437494
-- 
Your team curtin developers is requested to review the proposed merge of ~ogayot/curtin:curthooks-fix-apt-config-translation into curtin:master.