Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cope with UnicodeDecodeError on git svn output

Browse Source 
svn: r23138
This commit is contained in:
Vassilii Khachaturov 2013-09-15 14:56:01 +00:00
parent f7c036ab52
commit f4be9dfc70
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gramps/gen/svn_revision.py
View File

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
# #
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
@ -20,6 +21,8 @@
# $Id$ # $Id$
from __future__ import unicode_literals
import sys import sys
import subprocess import subprocess
import re import re
@ -43,7 +46,10 @@ def _get_svn_revision(path, command, stdout_to_rev):
return "" # subprocess failed return "" # subprocess failed
# subprocess worked # subprocess worked
if stdout and len(stdout) > 0: # has output if stdout and len(stdout) > 0: # has output
stdout = cuni(stdout) # get a proper string try:
stdout = cuni(stdout) # get a proper string
except UnicodeDecodeError:
pass
rev = stdout_to_rev(stdout) rev = stdout_to_rev(stdout)
return "-r" + rev if rev else "" return "-r" + rev if rev else ""
else: # no output from svnversion else: # no output from svnversion