[jhbuild] svn: decode svn command output



commit e8f0845773e408969ecd104d2efe8d067b034d30
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Sat Oct 19 10:28:16 2019 +0200

    svn: decode svn command output
    
    Fixes #40

 jhbuild/versioncontrol/svn.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/jhbuild/versioncontrol/svn.py b/jhbuild/versioncontrol/svn.py
index 53bd4cbf..e3b5f374 100644
--- a/jhbuild/versioncontrol/svn.py
+++ b/jhbuild/versioncontrol/svn.py
@@ -28,7 +28,7 @@ import subprocess
 from jhbuild.errors import CommandError, BuildStateError
 from jhbuild.utils.cmds import get_output, check_version
 from jhbuild.versioncontrol import Repository, Branch, register_repo_type
-from jhbuild.utils import inpath, _, urlutils
+from jhbuild.utils import inpath, _, urlutils, udecode
 from jhbuild.utils.sxml import sxml
 from jhbuild.utils.urlutils import urlparse_mod
 
@@ -313,6 +313,7 @@ class SubversionBranch(Branch):
                     stdout = subprocess.PIPE, **kws).communicate()[0]
         except OSError as e:
             raise CommandError(str(e))
+        output = udecode(output)
         if '\nConflict' in output:
             raise CommandError(_('Error checking for conflicts'))
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]