diff options
| author | zdc <zdc@users.noreply.github.com> | 2022-04-07 20:24:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-07 20:24:57 +0300 |
| commit | 45c1d42e15f4a5fe5e176e1516b2da9d21e7837a (patch) | |
| tree | 0535c3cf76b60dbf585416b4490c5bd9c9c99359 /cloudinit/mergers/m_str.py | |
| parent | 96226f37cdbdaef2fbc51de7b9ca75b61a16792b (diff) | |
| parent | aa60d48c2711cdcd9f88a4e5c77379adb0408231 (diff) | |
| download | vyos-cloud-init-45c1d42e15f4a5fe5e176e1516b2da9d21e7837a.tar.gz vyos-cloud-init-45c1d42e15f4a5fe5e176e1516b2da9d21e7837a.zip | |
Merge pull request #52 from vyos/current
T2117: Backport Cloud-init 22.1 with our changes to VyOS 1.3
Diffstat (limited to 'cloudinit/mergers/m_str.py')
| -rw-r--r-- | cloudinit/mergers/m_str.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cloudinit/mergers/m_str.py b/cloudinit/mergers/m_str.py index 539e3e29..a96bae5e 100644 --- a/cloudinit/mergers/m_str.py +++ b/cloudinit/mergers/m_str.py @@ -7,10 +7,10 @@ class Merger(object): def __init__(self, _merger, opts): - self._append = 'append' in opts + self._append = "append" in opts def __str__(self): - return 'StringMerger: (append=%s)' % (self._append) + return "StringMerger: (append=%s)" % (self._append) # On encountering a unicode object to merge value with # we will for now just proxy into the string method to let it handle it. @@ -27,4 +27,5 @@ class Merger(object): return merge_with return value + merge_with + # vi: ts=4 expandtab |