diff options
| author | zsdc <taras@vyos.io> | 2022-03-25 20:58:01 +0200 |
|---|---|---|
| committer | zsdc <taras@vyos.io> | 2022-03-25 21:42:00 +0200 |
| commit | 31448cccedd8f841fb3ac7d0f2e3cdefe08a53ba (patch) | |
| tree | 349631a02467dae0158f6f663cc8aa8537974a97 /cloudinit/mergers/m_str.py | |
| parent | 5c4b3943343a85fbe517e5ec1fc670b3a8566b4b (diff) | |
| parent | 8537237d80a48c8f0cbf8e66aa4826bbc882b022 (diff) | |
| download | vyos-cloud-init-31448cccedd8f841fb3ac7d0f2e3cdefe08a53ba.tar.gz vyos-cloud-init-31448cccedd8f841fb3ac7d0f2e3cdefe08a53ba.zip | |
T2117: Cloud-init updated to 22.1
Merged with 22.1 tag from the upstream Cloud-init repository.
Our modules were slightly modified for compatibility with the new
version.
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 |