Merge lp:~npochet/landscape-charm/landscape-charm into lp:~landscape/landscape-charm/trunk

[Nicolas Pochet]

Run apt update after adding a new source

Run apt update after adding a new source

[Nicolas Pochet (npochet)]

Fixes the behavior observed in https://bugs.launchpad.net/landscape-charm/+bug/1813447/comments/2

[Simon Poirier (simpoir)]

This seems like a fix which should be in charmhelpers, which does refresh before importing a repo key (unlike when it's using ppa:something). I don't mind this change, but I'd rather have this fixed upstream and pulled down to all our charms (which probably suffer from this) than individual charm fixes.

review: Needs Information

[lp:~npochet/landscape-charm/landscape-charm]

398. By Nicolas Pochet on 2019-05-21

Use charmhelpers update instead of landscape charm

[Nicolas Pochet (npochet)]

> This seems like a fix which should be in charmhelpers, which does refresh
> before importing a repo key (unlike when it's using ppa:something). I don't
> mind this change, but I'd rather have this fixed upstream and pulled down to
> all our charms (which probably suffer from this) than individual charm fixes.
I took your advice into account and modified the use of the configure_source function to do the update there.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Fail
Revno: 398
Branch: lp:~npochet/landscape-charm/landscape-charm
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3941/

review: Needs Fixing (test results)

[Simon Poirier (simpoir)]

I've submitted a PR to upstream charm-helpers https://github.com/juju/charm-helpers/pull/326 as from the debug-logs, apt update does happen, but fails due to missing keys.

[Simon Poirier (simpoir)]

After verifying, this change should be unnecessary following upstream charmhelpers update. As such, I've marked this MP as rejected. Please reopen if you don't see the issue resolved. Thanks.

Unmerged revisions

398. By Nicolas Pochet on 2019-05-21

Use charmhelpers update instead of landscape charm

397. By Nicolas Pochet on 2019-05-21

Run apt update after adding a new source

=== modified file 'lib/apt.py'
--- lib/apt.py	2019-01-17 14:23:49 +0000
+++ lib/apt.py	2019-05-21 16:55:29 +0000
@@ -145,7 +145,7 @@
         if install_sources and source:
             raise SourceConflictError(install_sources, source)
         if install_sources:
-            self._fetch.configure_sources()
+            self._fetch.configure_sources(update=True)
             return
         if not source:
             raise AptNoSourceConfigError()