Merge lp:~ballot/juju-deployer/LP1892423 into lp:juju-deployer

Proposed by Benjamin Allot
Status: Rejected
Rejected by: Tom Haddon
Proposed branch: lp:~ballot/juju-deployer/LP1892423
Merge into: lp:juju-deployer
Diff against target: 11 lines (+1/-1)
1 file modified
deployer/deployment.py (+1/-1)
To merge this branch: bzr merge lp:~ballot/juju-deployer/LP1892423
Reviewer Review Type Date Requested Status
Tom Haddon Needs Fixing
Canonical IS Reviewers Pending
Review via email: mp+408549@code.launchpad.net

Commit message

To post a comment you must log in.
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

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

Revision history for this message
Tom Haddon (mthaddon) wrote :

This doesn't quite work as expected, because on python3 decoding a base64 bytestring returns a bytestring:

base64.b64decode(base64.b64encode(b'HelloWorld').decode()) == b'HelloWorld'

review: Needs Fixing
Revision history for this message
Tom Haddon (mthaddon) wrote :

Rejecting since we have another approved MP for this.

Unmerged revisions

223. By Benjamin Allot

Attempt to address LP#1892423 and prevent prefixing with "b" upon include-file.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'deployer/deployment.py'
--- deployer/deployment.py 2020-10-16 07:29:31 +0000
+++ deployer/deployment.py 2021-09-14 08:42:20 +0000
@@ -269,7 +269,7 @@
269 v = fh.read()269 v = fh.read()
270 if include_type == "base64":270 if include_type == "base64":
271 v = b64encode(v)271 v = b64encode(v)
272 return v272 return v.decode()
273 if feedback:273 if feedback:
274 return feedback274 return feedback
275275

Subscribers

People subscribed via source and target branches