summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael Martins <rafaelmartins@gentoo.org>2012-08-04 19:58:29 +0000
committerRafael Martins <rafaelmartins@gentoo.org>2012-08-04 19:58:29 +0000
commit957d46cc510cbedddbdc5778686bd001f1da4733 (patch)
tree8290a3e45fbc73db68da43bd1f53d74e57574fdf /www-apps/blohg
parentStable for x86, wrt bug #418787 (diff)
downloadgentoo-2-957d46cc510cbedddbdc5778686bd001f1da4733.tar.gz
gentoo-2-957d46cc510cbedddbdc5778686bd001f1da4733.tar.bz2
gentoo-2-957d46cc510cbedddbdc5778686bd001f1da4733.zip
Fix tests with recent mercurial versions.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'www-apps/blohg')
-rw-r--r--www-apps/blohg/ChangeLog6
-rw-r--r--www-apps/blohg/blohg-0.10.1.ebuild9
-rw-r--r--www-apps/blohg/files/0.10.1_fix-tests.patch33
3 files changed, 45 insertions, 3 deletions
diff --git a/www-apps/blohg/ChangeLog b/www-apps/blohg/ChangeLog
index 467ebb3cc496..baf03046cbb8 100644
--- a/www-apps/blohg/ChangeLog
+++ b/www-apps/blohg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-apps/blohg
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/ChangeLog,v 1.19 2012/07/06 22:24:13 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/ChangeLog,v 1.20 2012/08/04 19:58:28 rafaelmartins Exp $
+
+ 04 Aug 2012; Rafael G. Martins <rafaelmartins@gentoo.org>
+ +files/0.10.1_fix-tests.patch, blohg-0.10.1.ebuild:
+ Fix tests with recent mercurial versions.
06 Jul 2012; Rafael G. Martins <rafaelmartins@gentoo.org>
blohg-0.10.1.ebuild, blohg-9999.ebuild:
diff --git a/www-apps/blohg/blohg-0.10.1.ebuild b/www-apps/blohg/blohg-0.10.1.ebuild
index 934da8eef455..7e69747e517a 100644
--- a/www-apps/blohg/blohg-0.10.1.ebuild
+++ b/www-apps/blohg/blohg-0.10.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/blohg-0.10.1.ebuild,v 1.2 2012/07/06 22:24:13 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/blohg/blohg-0.10.1.ebuild,v 1.3 2012/08/04 19:58:28 rafaelmartins Exp $
EAPI="3"
@@ -16,7 +16,7 @@ if [[ ${PV} = *9999* ]]; then
EHG_REVISION="default"
fi
-inherit distutils ${HG_ECLASS}
+inherit eutils distutils ${HG_ECLASS}
DESCRIPTION="A Mercurial-based blogging engine."
HOMEPAGE="http://blohg.org/ http://pypi.python.org/pypi/blohg"
@@ -48,6 +48,11 @@ DEPEND="${CDEPEND}
RDEPEND="${CDEPEND}"
+src_prepare() {
+ epatch "${FILESDIR}/${PV}_fix-tests.patch"
+ distutils_src_prepare
+}
+
src_compile() {
distutils_src_compile
diff --git a/www-apps/blohg/files/0.10.1_fix-tests.patch b/www-apps/blohg/files/0.10.1_fix-tests.patch
new file mode 100644
index 000000000000..3d1578f11800
--- /dev/null
+++ b/www-apps/blohg/files/0.10.1_fix-tests.patch
@@ -0,0 +1,33 @@
+# HG changeset patch
+# User Rafael G. Martins <rafael@rafaelmartins.eng.br>
+# Date 1344052271 10800
+# Node ID c63455b2d73d91c64e74b0eaad4b621e966c58e0
+# Parent c0b3aee9771d15b265b673ae00f8a2fe6822e635
+Fix tests, broken by a recent change on the Mercurial API.
+
+--- a/blohg/testsuite.py
++++ b/blohg/testsuite.py
+@@ -46,6 +46,7 @@
+ self.app = create_app(self.repo_path, hgui=self.ui)
+ create_repo(self.app)
+ self.repo = hg.repository(self.ui, self.repo_path)
++ commands.add(self.ui, self.repo)
+ self.app.hg.reload()
+
+ def tearDown(self):
+@@ -118,6 +119,7 @@
+ 'foo-bar.rst')
+ with codecs.open(new_file, 'w', encoding='utf-8') as fp:
+ fp.write(os.linesep.join(['Foo', '---', '', 'Bar']))
++ commands.add(self.ui, self.repo)
+
+ self.app.hg.reload()
+ with self.app.test_request_context():
+@@ -154,6 +156,7 @@
+
+ with codecs.open(new_file, 'w', encoding='utf-8') as fp:
+ fp.write('foo')
++ commands.add(self.ui, self.repo)
+
+ self.app.hg.reload()
+ with self.app.test_request_context():