Merge ~cjwatson/launchpad:walblock-binary into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: df66724b9111341736552c351e64420efeac62f1
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:walblock-binary
Merge into: launchpad:master
Diff against target: 20 lines (+4/-4)
1 file modified
database/replication/walblock.py (+4/-4)
Reviewer Review Type Date Requested Status
Ioana Lasc Approve
Cristian Gonzalez (community) Approve
Review via email: mp+407257@code.launchpad.net

Commit message

Treat PostgreSQL dumps as binary

Description of the change

Otherwise this crashes on Python 3.

To post a comment you must log in.
Revision history for this message
Cristian Gonzalez (cristiangsp) wrote :

Looks good!

review: Approve
Revision history for this message
Ioana Lasc (ilasc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/database/replication/walblock.py b/database/replication/walblock.py
2index 0e2b5a9..8cbf8ad 100755
3--- a/database/replication/walblock.py
4+++ b/database/replication/walblock.py
5@@ -47,11 +47,11 @@ def main():
6 if options.verbose and notified:
7 print(' ... Done', file=sys.stderr)
8
9- chunk = sys.stdin.read(chunk_size)
10- if chunk == '':
11- sys.stdout.flush()
12+ chunk = sys.stdin.buffer.read(chunk_size)
13+ if chunk == b'':
14+ sys.stdout.buffer.flush()
15 return 0
16- sys.stdout.write(chunk)
17+ sys.stdout.buffer.write(chunk)
18
19
20 if __name__ == '__main__':

Subscribers

People subscribed via source and target branches

to status/vote changes: