Merge lp:~tcuthbert/ubuntu-repository-cache/fix-nrpe into lp:ubuntu-repository-cache

Proposed by Thomas Cuthbert
Status: Merged
Approved by: Haw Loeung
Approved revision: no longer in the source branch.
Merged at revision: 345
Proposed branch: lp:~tcuthbert/ubuntu-repository-cache/fix-nrpe
Merge into: lp:ubuntu-repository-cache
Diff against target: 24 lines (+4/-4)
1 file modified
lib/ubuntu_repository_cache/apache.py (+4/-4)
To merge this branch: bzr merge lp:~tcuthbert/ubuntu-repository-cache/fix-nrpe
Reviewer Review Type Date Requested Status
Haw Loeung +1 Approve
Canonical IS Reviewers Pending
Review via email: mp+423576@code.launchpad.net

Commit message

fix(nrpe): fix broken shell quoting in apache nrpe checks

To post a comment you must log in.
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 :

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

345. By Thomas Cuthbert

fix(nrpe): fix broken shell quoting in apache nrpe checks

Reviewed-on: https://code.launchpad.net/~tcuthbert/ubuntu-repository-cache/fix-nrpe/+merge/423576
Reviewed-by: Haw Loeung <email address hidden>

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

Change successfully merged at revision 345

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/ubuntu_repository_cache/apache.py'
2--- lib/ubuntu_repository_cache/apache.py 2021-03-11 23:09:11 +0000
3+++ lib/ubuntu_repository_cache/apache.py 2022-05-30 01:21:16 +0000
4@@ -359,8 +359,8 @@
5 '--hostname ubuntu-archive-asm.trafficmanager.net '
6 '--url "/{}/" '
7 '--string "dists/" '
8- '--expect \"200\\ OK\" '
9- '--header \"Accept-Encoding:\\ \\*\"'
10+ '--expect \\"200 OK\\" '
11+ '--header \\"Accept-Encoding: *\\"'
12 ).format(path_base),
13 )
14
15@@ -372,7 +372,7 @@
16 '--hostname localhost '
17 '--url "/{}/" '
18 '--string "dists/" '
19- '--expect \"200\\ OK\" '
20- '--header \"Accept-Encoding:\\ \\*\"'
21+ '--expect \\"200 OK\\" '
22+ '--header \\"Accept-Encoding: *\\"'
23 ).format(path_base),
24 )

Subscribers

People subscribed via source and target branches