Merge ~daniel-thewatkins/cloud-init/+git/cloud-init:nested_set into cloud-init:master

Proposed by Dan Watkins on 2019-02-21
Status: Merged
Approved by: Dan Watkins on 2019-02-26
Approved revision: d6a8772f3f20b58e2b5ab1b9669083b5952e8583
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~daniel-thewatkins/cloud-init/+git/cloud-init:nested_set
Merge into: cloud-init:master
Diff against target: 11 lines (+1/-1)
1 file modified
cloudinit/config/cc_rsyslog.py (+1/-1)
Reviewer Review Type Date Requested Status
Ryan Harper 2019-02-21 Approve on 2019-02-26
Server Team CI bot continuous-integration Approve on 2019-02-21
Review via email: mp+363483@code.launchpad.net

Commit message

cc_rsyslog: Escape possible nested set

Under Python 3.7, we are seeing `FutureWarning: Possible nested set at
position 23`; escaping this bracket causes that warning to disappear.

LP: #1816967

To post a comment you must log in.

FAILED: Continuous integration, rev:d6a8772f3f20b58e2b5ab1b9669083b5952e8583
https://jenkins.ubuntu.com/server/job/cloud-init-ci/574/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    FAILED: Ubuntu LTS: Integration

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/574/rebuild

review: Needs Fixing (continuous-integration)

FAILED: Continuous integration, rev:d6a8772f3f20b58e2b5ab1b9669083b5952e8583
https://jenkins.ubuntu.com/server/job/cloud-init-ci/575/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    FAILED: Ubuntu LTS: Integration

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/575/rebuild

review: Needs Fixing (continuous-integration)

PASSED: Continuous integration, rev:d6a8772f3f20b58e2b5ab1b9669083b5952e8583
https://jenkins.ubuntu.com/server/job/cloud-init-ci/576/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/576/rebuild

review: Approve (continuous-integration)
Ryan Harper (raharper) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/config/cc_rsyslog.py b/cloudinit/config/cc_rsyslog.py
2index 27d2366..22b1753 100644
3--- a/cloudinit/config/cc_rsyslog.py
4+++ b/cloudinit/config/cc_rsyslog.py
5@@ -203,7 +203,7 @@ LOG = logging.getLogger(__name__)
6 COMMENT_RE = re.compile(r'[ ]*[#]+[ ]*')
7 HOST_PORT_RE = re.compile(
8 r'^(?P<proto>[@]{0,2})'
9- r'(([[](?P<bracket_addr>[^\]]*)[\]])|(?P<addr>[^:]*))'
10+ r'(([\[](?P<bracket_addr>[^\]]*)[\]])|(?P<addr>[^:]*))'
11 r'([:](?P<port>[0-9]+))?$')
12
13

Subscribers

People subscribed via source and target branches