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

6321: installed rcs and tried to make an archive

Browse Source 
svn: r21082
This commit is contained in:
Benny Malengier 2013-01-12 14:48:37 +00:00
parent e677f40cab
commit 1f825771b5
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gramps/gui/dbman.py
View File

@ -50,7 +50,7 @@ else:
import logging import logging
LOG = logging.getLogger(".DbManager") LOG = logging.getLogger(".DbManager")
from gramps.gen.constfunc import win from gramps.gen.constfunc import win, UNITYPE
if win(): if win():
_RCS_FOUND = os.system("rcs -V >nul 2>nul") == 0 _RCS_FOUND = os.system("rcs -V >nul 2>nul") == 0
if _RCS_FOUND and "TZ" not in os.environ: if _RCS_FOUND and "TZ" not in os.environ:
@ -798,6 +798,9 @@ def find_revisions(name):
get_next = False get_next = False
if os.path.isfile(name): if os.path.isfile(name):
for line in proc.stdout: for line in proc.stdout:
if sys.version_info[0] >= 3 and not isinstance(line, UNITYPE):
# we assume utf-8 ...
line = line.decode('utf-8')
match = rev.match(line) match = rev.match(line)
if match: if match:
rev_str = copy.copy(match.groups()[0]) rev_str = copy.copy(match.groups()[0])