Merge ~ballot/autocert-charm/+git/autocert-charm:fix_bionic into autocert-charm:master

Proposed by Benjamin Allot
Status: Merged
Approved by: Haw Loeung
Approved revision: 5598259adc78b5e511c1604c0e3b4a4319ed9ad3
Merged at revision: fcd0748fffd2144981ad7312c1ce94285cc47843
Proposed branch: ~ballot/autocert-charm/+git/autocert-charm:fix_bionic
Merge into: autocert-charm:master
Diff against target: 50 lines (+6/-3)
4 files modified
charmcraft.yaml (+2/-1)
config.yaml (+2/-0)
metadata.yaml (+1/-1)
reactive/autocert.py (+1/-1)
Reviewer Review Type Date Requested Status
Haw Loeung +1 Approve
🤖 Canonical IS Review Bot Approve
Review via email: mp+450993@code.launchpad.net

Commit message

Fix autocert install on bionic

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 Canonical IS Review Bot (canonical-is-reviewbot) wrote :

Proxy approval for barryprice

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Merge proposal is approved, but source revision has changed, setting status to needs review.

Revision history for this message
Haw Loeung (hloeung) wrote :

LGTM

review: Approve (+1)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision fcd0748fffd2144981ad7312c1ce94285cc47843

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charmcraft.yaml b/charmcraft.yaml
2index a9e8c86..3c98788 100644
3--- a/charmcraft.yaml
4+++ b/charmcraft.yaml
5@@ -16,4 +16,5 @@ parts:
6 charm:
7 source: .
8 plugin: reactive
9- build-snaps: [charm]
10+ build-snaps:
11+ - charm/2.x/stable
12diff --git a/config.yaml b/config.yaml
13index 8ab0a14..371c965 100644
14--- a/config.yaml
15+++ b/config.yaml
16@@ -53,6 +53,8 @@ options:
17 description: Prefix for saved cert/key files, e.g. "autocert" for "autocert_<foo.example.com>.crt"
18 install_sources:
19 default: "ppa:autocert-devs/stable"
20+ type: string
21+ description: PPA or repository to install the package from
22 run_weekdays:
23 default: False
24 type: boolean
25diff --git a/metadata.yaml b/metadata.yaml
26index 6aca766..6b0ac52 100644
27--- a/metadata.yaml
28+++ b/metadata.yaml
29@@ -1,7 +1,7 @@
30 name: autocert
31 summary: Automated X.509 certificate/key renewal service client
32 maintainers:
33- - launchpad.net/~autocert-charmers
34+ - Autocert Charmers <autocert-charmers@lists.launchpad.net>
35 issues: https://bugs.launchpad.net/autocert-charm
36 series:
37 - jammy
38diff --git a/reactive/autocert.py b/reactive/autocert.py
39index 984dabf..1f21632 100644
40--- a/reactive/autocert.py
41+++ b/reactive/autocert.py
42@@ -266,7 +266,7 @@ def write_cert_config():
43 # clean up previous config before rewriting fresh config from valid YAML
44 if path.isdir(service_dir):
45 # if the service directory already exists (i.e. skip if first run)
46- for (dirpath, dirnames, filenames) in walk(service_dir):
47+ for dirpath, dirnames, filenames in walk(service_dir):
48 break
49
50 for f in filenames:

Subscribers

People subscribed via source and target branches

to all changes: