summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirkjan Ochtman <djc@gentoo.org>2013-02-03 20:36:11 +0000
committerDirkjan Ochtman <djc@gentoo.org>2013-02-03 20:36:11 +0000
commit19eb937b438f5a7e4f6ea533ba324682279ce9af (patch)
tree207557c416ae8eeb2024463b08c8dead29192e04 /www-apps/trac/files
parentVersion bump. Convert to distutils-r1. (diff)
downloadgentoo-2-19eb937b438f5a7e4f6ea533ba324682279ce9af.tar.gz
gentoo-2-19eb937b438f5a7e4f6ea533ba324682279ce9af.tar.bz2
gentoo-2-19eb937b438f5a7e4f6ea533ba324682279ce9af.zip
Fix test failure (upstream issue #11045).
(Portage version: 2.1.11.40/cvs/Linux x86_64, signed Manifest commit with key 6B065BFB)
Diffstat (limited to 'www-apps/trac/files')
-rw-r--r--www-apps/trac/files/1.0.1-git-identity.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/www-apps/trac/files/1.0.1-git-identity.patch b/www-apps/trac/files/1.0.1-git-identity.patch
new file mode 100644
index 000000000000..703a2dbc67d5
--- /dev/null
+++ b/www-apps/trac/files/1.0.1-git-identity.patch
@@ -0,0 +1,36 @@
+http://trac.edgewall.org/changeset/11675
+
+Index: /branches/1.0-stable/tracopt/versioncontrol/git/tests/PyGIT.py
+===================================================================
+--- /branches/1.0-stable/tracopt/versioncontrol/git/tests/PyGIT.py (revision 11674)
++++ /branches/1.0-stable/tracopt/versioncontrol/git/tests/PyGIT.py (revision 11675)
+@@ -153,4 +153,6 @@
+ # create git repository and master branch
+ self._git('init', self.repos_path)
++ self._git('config', 'user.name', u"Joé")
++ self._git('config', 'user.email', "joe@example.com")
+ create_file(os.path.join(self.repos_path, '.gitignore'))
+ self._git('add', '.gitignore')
+@@ -166,5 +168,5 @@
+ cwd=self.repos_path)
+ proc.wait()
+- assert proc.returncode == 0
++ assert proc.returncode == 0, proc.stderr.read()
+ return proc
+
+@@ -181,5 +183,6 @@
+ create_file(os.path.join(self.repos_path, 'tickét.txt'))
+ self._git('add', 'tickét.txt')
+- self._git('commit', '-m', 'unicode-filename')
++ self._git('commit', '-m', 'unicode-filename',
++ '--date', 'Sun Feb 3 18:30 2013 +0100')
+ storage = self._storage()
+ filenames = sorted(fname for mode, type, sha, size, fname
+@@ -189,4 +192,7 @@
+ self.assertEquals(u'.gitignore', filenames[0])
+ self.assertEquals(u'tickét.txt', filenames[1])
++ # check commit author, for good measure
++ self.assertEquals(u'Joé <joe@example.com> 1359912600 +0100',
++ storage.read_commit(storage.head())[1]['author'][0])
+
+ def test_unicode_branches(self):