diff options
| author |  Anton Gyllenberg <anton@iki.fi> | 2007-11-19 12:37:16 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-11-19 23:24:34 -0800 |
| commit | 59adeef48fcc3ea3e1288ce62260fdd8f46240da (patch) | |
| tree | b66fb223a3bf942fe0355f656e019024f34df8a4 /contrib | |
| parent | git-send-email: show all headers when sending mail (diff) | |
| download | tgif-59adeef48fcc3ea3e1288ce62260fdd8f46240da.tar.xz | |
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>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/gitview/gitview | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/contrib/gitview/gitview b/contrib/gitview/gitview index 449ee69bf4..4c99dfb903 100755 --- a/contrib/gitview/gitview +++ b/contrib/gitview/gitview @@ -27,20 +27,17 @@ import math import string import fcntl +have_gtksourceview2 = False +have_gtksourceview = False try: import gtksourceview2 have_gtksourceview2 = True except ImportError: - have_gtksourceview2 = False - -try: - import gtksourceview - have_gtksourceview = True -except ImportError: - have_gtksourceview = False - -if not have_gtksourceview2 and not have_gtksourceview: - print "Running without gtksourceview2 or gtksourceview module" + try: + import gtksourceview + have_gtksourceview = True + except ImportError: + print "Running without gtksourceview2 or gtksourceview module" re_ident = re.compile('(author|committer) (?P<ident>.*) (?P<epoch>\d+) (?P<tz>[+-]\d{4})') |