Fix TestLogGraphProvider tests.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 51 insertions, 3 deletions

diff --git a/dev-util/qbzr/ChangeLog b/dev-util/qbzr/ChangeLog
index 003bdccb76d9..00cdd1bbae7d 100644
--- a/dev-util/qbzr/ChangeLog
+++ b/dev-util/qbzr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/qbzr
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qbzr/ChangeLog,v 1.15 2009/10/06 21:04:20 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qbzr/ChangeLog,v 1.16 2009/10/06 22:39:22 pva Exp $
+
+  06 Oct 2009; Peter Volkov <pva@gentoo.org> qbzr-0.14.3.ebuild,
+  +files/qbzr-0.14.3-has_dir.patch:
+  Fix TestLogGraphProvider tests.
 
 *qbzr-0.14.3 (06 Oct 2009)
 
diff --git a/dev-util/qbzr/files/qbzr-0.14.3-has_dir.patch b/dev-util/qbzr/files/qbzr-0.14.3-has_dir.patch
new file mode 100644
index 000000000000..80d965e8a4d8
--- /dev/null
+++ b/dev-util/qbzr/files/qbzr-0.14.3-has_dir.patch
@@ -0,0 +1,39 @@
+=== modified file 'lib/tests/test_loggraphprovider.py'
+--- lib/tests/test_loggraphprovider.py	2009-07-02 01:24:02 +0000
++++ lib/tests/test_loggraphprovider.py	2009-10-04 19:42:42 +0000
+@@ -79,18 +79,15 @@
+         self.assertEqual(None, bi.index)
+ 
+         self.assertEqual(['file1-id'], gp.fileids)
+-        self.assertFalse(gp.has_dir)
+         
+         gp.open_branch(branch, tree=tree, file_ids = ['dir-id'])        
+         self.assertEqual(['file1-id', 'dir-id'], gp.fileids)
+-        self.assertTrue(gp.has_dir)
+         
+         # Check that a new branch has not been added.
+         self.assertLength(1, gp.branches)
+         
+         gp.open_branch(branch, tree=tree, file_ids = ['file3-id'])
+         self.assertEqual(['file1-id', 'dir-id','file3-id'], gp.fileids)
+-        self.assertTrue(gp.has_dir)
+         
+         # Check that a new branch has not been added.
+         self.assertLength(1, gp.branches)
+@@ -162,15 +159,12 @@
+         
+         gp.open_locations(['branch/file1'])
+         self.assertEqual(['file1-id'], gp.fileids)
+-        self.assertFalse(gp.has_dir)
+         
+         gp.open_locations(['branch/dir'])
+         self.assertEqual(['file1-id', 'dir-id'], gp.fileids)
+-        self.assertTrue(gp.has_dir)
+         
+         gp.open_locations(['branch/file3'])
+         self.assertEqual(['file1-id', 'dir-id','file3-id'], gp.fileids)
+-        self.assertTrue(gp.has_dir)
+     
+     def test_open_locations_files(self):
+         tree = self.make_branch_and_tree_with_files_and_dir()
+
diff --git a/dev-util/qbzr/qbzr-0.14.3.ebuild b/dev-util/qbzr/qbzr-0.14.3.ebuild
index db3074221a20..427a0454a39b 100644
--- a/dev-util/qbzr/qbzr-0.14.3.ebuild
+++ b/dev-util/qbzr/qbzr-0.14.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qbzr/qbzr-0.14.3.ebuild,v 1.1 2009/10/06 21:04:20 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qbzr/qbzr-0.14.3.ebuild,v 1.2 2009/10/06 22:39:22 pva Exp $
 
 EAPI=2
 
@@ -10,7 +10,7 @@ inherit distutils versionator
 
 DESCRIPTION="Qt frontend for Bazaar"
 HOMEPAGE="https://launchpad.net/qbzr"
-SRC_URI="http://launchpad.net/qbzr/0.14/${PV}/+download/${P}.tar.gz"
+SRC_URI="http://launchpad.net/qbzr/$(get_version_component_range 1-2)/${PV}/+download/${PN}-${PV/.0}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -29,6 +29,11 @@ S=${WORKDIR}/${PN}
 
 PYTHON_MODNAME=bzrlib
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-has_dir.patch"
+	distutils_src_prepare
+}
+
 src_test() {
 	elog "It's impossible to run tests at this point. If you wish to run tests"
 	elog "after installation of ${PN} execute:"