From owner-svn-ports-all@freebsd.org Sat Jan 23 15:58:32 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 72AF0A8EEE0; Sat, 23 Jan 2016 15:58:32 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 250E91A71; Sat, 23 Jan 2016 15:58:32 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0NFwVXZ065616; Sat, 23 Jan 2016 15:58:31 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0NFwVnw065615; Sat, 23 Jan 2016 15:58:31 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201601231558.u0NFwVnw065615@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Sat, 23 Jan 2016 15:58:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r407038 - branches/2016Q1/devel/gitinspector/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Jan 2016 15:58:32 -0000 Author: feld Date: Sat Jan 23 15:58:30 2016 New Revision: 407038 URL: https://svnweb.freebsd.org/changeset/ports/407038 Log: MFH: r406986 devel/gitinspector: support build with LANG=C (fix from upstream) Gitinspect is now 4 releases behind. The problem where gitinspector will not build when LANG is set to "C" in the environment has been fixed for 14 months already. Apply the patch from the git repository upstream to fix (due to luck in name, it applies before patch-aa which affects the same localization file). I recommend that this port be upgraded to a new release though. Approved by: just fix it Approved by: ports-secteam (with hat) Added: branches/2016Q1/devel/gitinspector/files/patch-8755fb33dcb1 - copied unchanged from r406986, head/devel/gitinspector/files/patch-8755fb33dcb1 Modified: Directory Properties: branches/2016Q1/ (props changed) Copied: branches/2016Q1/devel/gitinspector/files/patch-8755fb33dcb1 (from r406986, head/devel/gitinspector/files/patch-8755fb33dcb1) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/devel/gitinspector/files/patch-8755fb33dcb1 Sat Jan 23 15:58:30 2016 (r407038, copy of r406986, head/devel/gitinspector/files/patch-8755fb33dcb1) @@ -0,0 +1,30 @@ +From 8755fb33dcb1e4398bec3e4931f04525b9a463e6 Mon Sep 17 00:00:00 2001 +From: Adam Waldenberg +Date: Mon, 24 Nov 2014 09:36:11 +0100 +Subject: [PATCH] Doesn't start when using "C" locale (Fixes issue 29). + +--- + gitinspector/localization.py | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +--- gitinspector/localization.py ++++ gitinspector/localization.py +@@ -51,11 +51,14 @@ def init(): + lang = locale.getdefaultlocale() + os.environ['LANG'] = lang[0] + +- filename = basedir.get_basedir() + "/translations/messages_%s.mo" % lang[0][0:2] ++ if lang[0] is not None: ++ filename = basedir.get_basedir() + "/translations/messages_%s.mo" % lang[0][0:2] + +- try: +- __translation__ = gettext.GNUTranslations(open(filename, "rb")) +- except IOError: ++ try: ++ __translation__ = gettext.GNUTranslations(open(filename, "rb")) ++ except IOError: ++ __translation__ = gettext.NullTranslations() ++ else: + __translation__ = gettext.NullTranslations() + + __enabled__ = True