[gentoo-commits] gentoo-x86 commit in dev-vcs/git-cola/files: 1.8.1-system-ssh-askpass.patch

[gentoo-commits] gentoo-x86 commit in dev-vcs/git-cola/files: 1.8.1-system-ssh-askpass.patch

[Justin Lecher (jlec)]

jlec        12/12/10 07:41:36

  Added:                1.8.1-system-ssh-askpass.patch
  Log:
  dev-vcs/git-cola: Version Bump
  
  (Portage version: 2.2.0_alpha147/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

Revision  Changes    Path
1.1                  dev-vcs/git-cola/files/1.8.1-system-ssh-askpass.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-cola/files/1.8.1-system-ssh-askpass.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-cola/files/1.8.1-system-ssh-askpass.patch?rev=1.1&content-type=text/plain

Index: 1.8.1-system-ssh-askpass.patch
===================================================================
 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 bc7906a..972eaa7 100644
--- a/cola/app.py
+++ b/cola/app.py
@@ -65,9 +65,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:
-        askpass = resources.share('bin', 'ssh-askpass')
+        askpass = resources.prefix('bin', 'ssh-askpass')
 
     compat.putenv('GIT_ASKPASS', askpass)
     compat.putenv('SSH_ASKPASS', askpass)
diff --git a/setup.py b/setup.py
index e202edc..81765a1 100755
--- a/setup.py
+++ b/setup.py
@@ -101,10 +101,6 @@ def cola_data_files():
     data.extend([_app_path(localedir, 'git-cola.mo')
                  for localedir in glob('share/locale/*/LC_MESSAGES')])
 
-    if sys.platform == 'darwin':
-        data.append(_app_path('share/git-cola/bin', 'ssh-askpass-darwin'))
-    else:
-        data.append(_app_path('share/git-cola/bin', 'ssh-askpass'))
     return data