From 67f48b8dd0fad827fa37f7850fed92750ef25b5e Mon Sep 17 00:00:00 2001 From: Olav Vitters Date: Sun, 25 Jan 2015 21:18:35 +0100 Subject: fix byte vs string differences --- mgagnome | 4 ++-- 1 file 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: -- cgit v1.2.1