summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlav Vitters <olav@vitters.nl>2015-01-25 21:18:35 +0100
committerOlav Vitters <olav@vitters.nl>2015-01-25 21:18:35 +0100
commit67f48b8dd0fad827fa37f7850fed92750ef25b5e (patch)
tree1ef10f780408e7c0bcd1cfeb25c6164ea0a8b28c
parentc3c3d15fb063b985a512cf69da8ad5dc581fd29b (diff)
downloadmgagnome-67f48b8dd0fad827fa37f7850fed92750ef25b5e.tar
mgagnome-67f48b8dd0fad827fa37f7850fed92750ef25b5e.tar.gz
mgagnome-67f48b8dd0fad827fa37f7850fed92750ef25b5e.tar.bz2
mgagnome-67f48b8dd0fad827fa37f7850fed92750ef25b5e.tar.xz
mgagnome-67f48b8dd0fad827fa37f7850fed92750ef25b5e.zip
fix byte vs string differences
-rwxr-xr-xmgagnome4
1 files changed, 2 insertions, 2 deletions
diff --git a/mgagnome b/mgagnome
index e006f56..dfc86b9 100755
--- a/mgagnome
+++ b/mgagnome
@@ -735,7 +735,7 @@ class SpecFile(object):
def ensure_no_local_changes(self, force=False):
# XXX - os.path.join is hackish
- svn_diff_output = subprocess.check_output(["svn", "diff", os.path.normpath(os.path.join(self.cwd, '..'))])
+ svn_diff_output = subprocess.check_output(["svn", "diff", os.path.normpath(os.path.join(self.cwd, '..'))]).decode('utf-8')
if svn_diff_output != '':
print(svn_diff_output)
print("ERROR: Package has uncommitted changes!", file=sys.stderr)
@@ -948,7 +948,7 @@ class Patch(object):
def svn_author(self):
if not hasattr(self, '_svn_author'):
try:
- contents = subprocess.check_output(['svn', 'log', '-q', "--", self.path], close_fds=True).strip("\n").splitlines()
+ contents = subprocess.check_output(['svn', 'log', '-q', "--", self.path], close_fds=True).strip("\n").decode('utf-8').splitlines()
for line in contents:
if ' | ' not in line: