kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

gitview: import only one of gtksourceview and gtksourceview2 

Importing both gtksourceview and gtksourceview2 will make python segfault
on my system (ubuntu 7.10). Change so that gtksourceview is only imported
if importing gtksourceview2 fails. This should be safe as gtksourceview
is only used if gtksourceview2 is not available.

Signed-off-by: Anton Gyllenberg <anton@iki.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Anton Gyllenberg 2007-11-19 12:37:16 +02:00 committed by Junio C Hamano
parent b7f30e0a97
commit 59adeef48f
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
contrib/gitview/gitview
View File

@ -27,20 +27,17 @@ import math
import string import string
import fcntl import fcntl


have_gtksourceview2 = False
have_gtksourceview = False
try: try:
import gtksourceview2 import gtksourceview2
have_gtksourceview2 = True have_gtksourceview2 = True
except ImportError: except ImportError:
have_gtksourceview2 = False try:

import gtksourceview
try: have_gtksourceview = True
import gtksourceview except ImportError:
have_gtksourceview = True print "Running without gtksourceview2 or gtksourceview module"
except ImportError:
have_gtksourceview = False

if not have_gtksourceview2 and not have_gtksourceview:
print "Running without gtksourceview2 or gtksourceview module"


re_ident = re.compile('(author|committer) (?P<ident>.*) (?P<epoch>\d+) (?P<tz>[+-]\d{4})') re_ident = re.compile('(author|committer) (?P<ident>.*) (?P<epoch>\d+) (?P<tz>[+-]\d{4})')