From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0D2EF138010 for ; Tue, 4 Sep 2012 06:44:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92181E02C4; Tue, 4 Sep 2012 06:44:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4DE83E02C4 for ; Tue, 4 Sep 2012 06:44:22 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8DC7233D7ED for ; Tue, 4 Sep 2012 06:44:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 52C08E543D for ; Tue, 4 Sep 2012 06:44:20 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1346741056.33777a90ef7932485293cc6d0dcbdb6bb5c0d6bf.jlec@gentoo> Subject: [gentoo-commits] proj/betagarden:master commit in: dev-vcs/git-cola/files/, dev-vcs/git-cola/ X-VCS-Repository: proj/betagarden X-VCS-Files: dev-vcs/git-cola/ChangeLog dev-vcs/git-cola/files/9999-system-ssh-askpass.patch X-VCS-Directories: dev-vcs/git-cola/files/ dev-vcs/git-cola/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 33777a90ef7932485293cc6d0dcbdb6bb5c0d6bf X-VCS-Branch: master Date: Tue, 4 Sep 2012 06:44:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 646cd1ed-d3c7-4de7-a6cc-0048406c76db X-Archives-Hash: 2775af1af4ea59678cc753b4a1c088f4 commit: 33777a90ef7932485293cc6d0dcbdb6bb5c0d6bf Author: Justin Lecher gentoo org> AuthorDate: Tue Sep 4 06:44:16 2012 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Sep 4 06:44:16 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=33777a90 dev-vcs/git-cola: Fix patch for current HEAD (Portage version: 2.2.0_alpha124/git/Linux x86_64, unsigned Manifest commit) --- dev-vcs/git-cola/ChangeLog | 4 +++ .../git-cola/files/9999-system-ssh-askpass.patch | 29 +++++++++++--------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dev-vcs/git-cola/ChangeLog b/dev-vcs/git-cola/ChangeLog index aae5ee1..804e67b 100644 --- a/dev-vcs/git-cola/ChangeLog +++ b/dev-vcs/git-cola/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-vcs/cola/ChangeLog,v 1.8 2011/04/13 19:00:02 jlec Exp $ + 04 Sep 2012; Justin Lecher + files/9999-system-ssh-askpass.patch: + Fix patch for current HEAD + 25 May 2012; Justin Lecher +files/9999-system-ssh-askpass.patch, git-cola-9999.ebuild: Import tree changes related to ssh_askpass handling diff --git a/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch b/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch index 665070d..b5133c0 100644 --- a/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch +++ b/dev-vcs/git-cola/files/9999-system-ssh-askpass.patch @@ -1,22 +1,25 @@ + cola/app.py | 4 ++-- + setup.py | 4 ---- + 2 files changed, 2 insertions(+), 6 deletions(-) + diff --git a/cola/app.py b/cola/app.py -index a689fdb..9618c3e 100644 +index d4351e3..9ec4ba8 100644 --- a/cola/app.py +++ b/cola/app.py -@@ -52,10 +52,10 @@ def setup_environment(): - # Provide an SSH_ASKPASS fallback - if sys.platform == 'darwin': - os.environ.setdefault('SSH_ASKPASS', -- resources.share('bin', 'ssh-askpass-darwin')) -+ resources.prefix('bin', 'ssh-askpass-darwin')) +@@ -69,9 +69,9 @@ def setup_environment(): + elif ssh_askpass: + askpass = ssh_askpass + elif sys.platform == 'darwin': +- askpass = resources.share('bin', 'ssh-askpass-darwin') ++ askpass = resources.prefix('bin', 'ssh-askpass-darwin') else: - os.environ.setdefault('SSH_ASKPASS', -- resources.share('bin', 'ssh-askpass')) -+ resources.prefix('bin', 'x11-ssh-askpass')) +- askpass = resources.share('bin', 'ssh-askpass') ++ askpass = resources.prefix('bin', 'ssh-askpass') - # Setup the path so that git finds us when we run 'git cola' - path_entries = os.environ.get('PATH').split(os.pathsep) + os.environ['GIT_ASKPASS'] = askpass + os.putenv('GIT_ASKPASS', askpass) diff --git a/setup.py b/setup.py -index d639eda..90d5fd0 100755 +index e202edc..81765a1 100755 --- a/setup.py +++ b/setup.py @@ -101,10 +101,6 @@ def cola_data_files():