charm-haproxy

Merge lp:~hloeung/charm-haproxy/fix-distro-release-detection into lp:charm-haproxy

  1. fix-distro-release-detection
  2. Merge into trunk
Proposed by Haw Loeung
Status: Merged
Approved by: Haw Loeung
Approved revision: 146
Merged at revision: 146
Proposed branch: lp:~hloeung/charm-haproxy/fix-distro-release-detection
Merge into: lp:charm-haproxy
Diff against target: 12 lines (+1/-2)
1 file modified
hooks/install (+1/-2)
To merge this branch: bzr merge lp:~hloeung/charm-haproxy/fix-distro-release-detection
Reviewer Review Type Date Requested Status
Paul Collins lgtm Approve
Canonical IS Reviewers Pending
The Canonical Sysadmins Pending
Review via email: mp+410096@code.launchpad.net

Commit message

Fix distro/release detection - LP:1946798

To post a comment you must log in.
Revision history for this message
Paul Collins (pjdc) :
review: Approve (lgtm)
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 Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 146

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/install'
2--- hooks/install 2021-10-08 11:50:06 +0000
3+++ hooks/install 2021-10-13 00:29:24 +0000
4@@ -11,8 +11,7 @@
5 juju-log 'Invoking charm-pre-install hooks'
6 [ -d exec.d ] && ( for f in exec.d/*/charm-pre-install; do [ -x $f ] && /bin/sh -c "$f"; done )
7
8-if awk -v bionic="18.04.5" -v distrib="$(lsb_release -rs)" 'BEGIN{distrib >= bionic}'
9-then
10+if dpkg --compare-versions "$(lsb_release -rs)" lt 20.04; then
11 # Install missing python-yaml and python-apt packages
12 apt-get install -y python2 python-yaml python-apt
13

Subscribers

People subscribed via source and target branches

to all changes: