diff options
| -rwxr-xr-x | mgagnome | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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: |