Yuvipanda has submitted this change and it was merged.
Change subject: labstore: Minor python3 fix to storage-replicate
......................................................................
labstore: Minor python3 fix to storage-replicate
Correct for the bytes vs string distinction which either did not
previously exist or was handled implicitly.
Change-Id: Id692a7a67f9a0b1ab8a50fbf5fc34087d6a60ed1
---
M modules/labstore/files/storage-replicate
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/modules/labstore/files/storage-replicate
b/modules/labstore/files/storage-replicate
index bf45916..f2bd578 100755
--- a/modules/labstore/files/storage-replicate
+++ b/modules/labstore/files/storage-replicate
@@ -107,9 +107,9 @@
err = se.read()
if not err or err == '':
- return (out, None)
+ return (out.decode(), None)
- return (None, err)
+ return (None, err.decode())
else:
sub = subprocess.Popen(list(cmd), stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
@@ -121,8 +121,8 @@
err = "killed by signal %d" % -sub.returncode
else:
err = "exited with %d" % sub.returncode
- return (None, err)
- return (out, None)
+ return (None, err.decode())
+ return (out.decode(), None)
class Lockdir:
--
To view, visit https://gerrit.wikimedia.org/r/226744
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id692a7a67f9a0b1ab8a50fbf5fc34087d6a60ed1
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
