diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2013-11-07 16:56:57 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2013-11-07 16:56:57 +0000 |
| commit | ad95bd03dccfe26bcdaa3780c34d0b535a9ec092 (patch) | |
| tree | a92c0eb0df32447973014ba9f2077308c89929ab /dev-vcs/git-cola/files | |
| parent | Version bump. (diff) | |
| download | historical-ad95bd03dccfe26bcdaa3780c34d0b535a9ec092.tar.gz historical-ad95bd03dccfe26bcdaa3780c34d0b535a9ec092.tar.bz2 historical-ad95bd03dccfe26bcdaa3780c34d0b535a9ec092.zip | |
dev-vcs/git-cola: Version BUmp
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!
Diffstat (limited to 'dev-vcs/git-cola/files')
| -rw-r--r-- | dev-vcs/git-cola/files/1.9.1-disable-tests.patch | 21 | ||||
| -rw-r--r-- | dev-vcs/git-cola/files/git-cola-1.9.1-system-ssh-askpass.patch | 16 |
2 files changed, 37 insertions, 0 deletions
diff --git a/dev-vcs/git-cola/files/1.9.1-disable-tests.patch b/dev-vcs/git-cola/files/1.9.1-disable-tests.patch new file mode 100644 index 000000000000..e5768cc079b1 --- /dev/null +++ b/dev-vcs/git-cola/files/1.9.1-disable-tests.patch @@ -0,0 +1,21 @@ +diff -Naur cola-1.3.7.21.orig/test/test_cola_git.py cola-1.3.7.21/test/test_cola_git.py +--- cola-1.3.7.21.orig/test/test_cola_git.py 2009-04-30 13:56:22.352319047 +0200 ++++ cola-1.3.7.21/test/test_cola_git.py 2009-04-30 13:56:53.123149963 +0200 +@@ -24,17 +24,6 @@ + version = self.git.version()[STDOUT] + self.failUnless(version.startswith('git version')) + +- def test_tag(self): +- """Test running 'git tag'""" +- tags = self.git.tag()[STDOUT].splitlines() +- self.failUnless( 'v1.0.0' in tags ) +- +- def test_show(self): +- """Test running 'git show'""" +- sha = '1b9742bda5d26a4f250fa64657f66ed20624a084' +- contents = self.git.show(sha)[STDOUT].splitlines() +- self.failUnless(contents[0] == '/build') +- + def test_stdout(self): + """Test overflowing the stdout buffer""" + # Write to stdout only diff --git a/dev-vcs/git-cola/files/git-cola-1.9.1-system-ssh-askpass.patch b/dev-vcs/git-cola/files/git-cola-1.9.1-system-ssh-askpass.patch new file mode 100644 index 000000000000..0aa476fe83ea --- /dev/null +++ b/dev-vcs/git-cola/files/git-cola-1.9.1-system-ssh-askpass.patch @@ -0,0 +1,16 @@ +diff --git a/cola/app.py b/cola/app.py +index f9236de..4636c81 100644 +--- a/cola/app.py ++++ b/cola/app.py +@@ -66,9 +66,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.setenv('GIT_ASKPASS', askpass) + compat.setenv('SSH_ASKPASS', askpass) |