[gentoo-commits] proj/betagarden:master commit in: dev-vcs/git-cola/files/, dev-vcs/git-cola/

["Justin Lecher" <jlec@gentoo.org>]

commit:     33777a90ef7932485293cc6d0dcbdb6bb5c0d6bf
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  4 06:44:16 2012 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> 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 <jlec@gentoo.org>
+  files/9999-system-ssh-askpass.patch:
+  Fix patch for current HEAD
+
   25 May 2012; Justin Lecher <jlec@gentoo.org>
   +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():