| 1 |
jlec 13/11/07 16:56:56 |
| 2 |
|
| 3 |
Added: git-cola-1.9.1-system-ssh-askpass.patch |
| 4 |
1.9.1-disable-tests.patch |
| 5 |
Log: |
| 6 |
dev-vcs/git-cola: Version BUmp |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-vcs/git-cola/files/git-cola-1.9.1-system-ssh-askpass.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-cola/files/git-cola-1.9.1-system-ssh-askpass.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-cola/files/git-cola-1.9.1-system-ssh-askpass.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: git-cola-1.9.1-system-ssh-askpass.patch |
| 17 |
=================================================================== |
| 18 |
diff --git a/cola/app.py b/cola/app.py |
| 19 |
index f9236de..4636c81 100644 |
| 20 |
--- a/cola/app.py |
| 21 |
+++ b/cola/app.py |
| 22 |
@@ -66,9 +66,9 @@ def setup_environment(): |
| 23 |
elif ssh_askpass: |
| 24 |
askpass = ssh_askpass |
| 25 |
elif sys.platform == 'darwin': |
| 26 |
- askpass = resources.share('bin', 'ssh-askpass-darwin') |
| 27 |
+ askpass = resources.prefix('bin', 'ssh-askpass-darwin') |
| 28 |
else: |
| 29 |
- askpass = resources.share('bin', 'ssh-askpass') |
| 30 |
+ askpass = resources.prefix('bin', 'ssh-askpass') |
| 31 |
|
| 32 |
compat.setenv('GIT_ASKPASS', askpass) |
| 33 |
compat.setenv('SSH_ASKPASS', askpass) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.1 dev-vcs/git-cola/files/1.9.1-disable-tests.patch |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-cola/files/1.9.1-disable-tests.patch?rev=1.1&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-cola/files/1.9.1-disable-tests.patch?rev=1.1&content-type=text/plain |
| 41 |
|
| 42 |
Index: 1.9.1-disable-tests.patch |
| 43 |
=================================================================== |
| 44 |
diff -Naur cola-1.3.7.21.orig/test/test_cola_git.py cola-1.3.7.21/test/test_cola_git.py |
| 45 |
--- cola-1.3.7.21.orig/test/test_cola_git.py 2009-04-30 13:56:22.352319047 +0200 |
| 46 |
+++ cola-1.3.7.21/test/test_cola_git.py 2009-04-30 13:56:53.123149963 +0200 |
| 47 |
@@ -24,17 +24,6 @@ |
| 48 |
version = self.git.version()[STDOUT] |
| 49 |
self.failUnless(version.startswith('git version')) |
| 50 |
|
| 51 |
- def test_tag(self): |
| 52 |
- """Test running 'git tag'""" |
| 53 |
- tags = self.git.tag()[STDOUT].splitlines() |
| 54 |
- self.failUnless( 'v1.0.0' in tags ) |
| 55 |
- |
| 56 |
- def test_show(self): |
| 57 |
- """Test running 'git show'""" |
| 58 |
- sha = '1b9742bda5d26a4f250fa64657f66ed20624a084' |
| 59 |
- contents = self.git.show(sha)[STDOUT].splitlines() |
| 60 |
- self.failUnless(contents[0] == '/build') |
| 61 |
- |
| 62 |
def test_stdout(self): |
| 63 |
"""Test overflowing the stdout buffer""" |
| 64 |
# Write to stdout only |
Archives