diff options
| author |   Christian Ruppert <idl0r@gentoo.org> | 2013-05-10 22:54:23 +0000 |
|---|---|---|
| committer | Christian Ruppert <idl0r@gentoo.org> | 2013-05-10 22:54:23 +0000 |
| commit | 4bc43bdf04c7692465a56d2e75703879065f79f4 (patch) | |
| tree | 76666b916fe181c3858e5e2d2964487ece190a7c /app-portage | |
| parent | Version (diff) | |
| download | gentoo-2-4bc43bdf04c7692465a56d2e75703879065f79f4.tar.gz gentoo-2-4bc43bdf04c7692465a56d2e75703879065f79f4.tar.bz2 gentoo-2-4bc43bdf04c7692465a56d2e75703879065f79f4.zip | |
Fix echangelog test when using Git
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)
Diffstat (limited to 'app-portage')
4 files changed, 55 insertions, 8 deletions
diff --git a/app-portage/gentoolkit-dev/ChangeLog b/app-portage/gentoolkit-dev/ChangeLog index 7a8e7e073128..0834b50d6e2e 100644 --- a/app-portage/gentoolkit-dev/ChangeLog +++ b/app-portage/gentoolkit-dev/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-portage/gentoolkit-dev # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog,v 1.116 2013/05/10 18:09:51 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/ChangeLog,v 1.117 2013/05/10 22:54:23 idl0r Exp $ + + 10 May 2013; Christian Ruppert <idl0r@gentoo.org> + gentoolkit-dev-0.2.8.2.ebuild, gentoolkit-dev-9999.ebuild, + +files/echangelog_test.patch: + Fix echangelog test when using Git *gentoolkit-dev-0.2.8.2 (10 May 2013) diff --git a/app-portage/gentoolkit-dev/files/echangelog_test.patch b/app-portage/gentoolkit-dev/files/echangelog_test.patch new file mode 100644 index 000000000000..7109f5c2174a --- /dev/null +++ b/app-portage/gentoolkit-dev/files/echangelog_test.patch @@ -0,0 +1,38 @@ +From 84321cc30126edc9a3fe51458a251b06fddce1ca Mon Sep 17 00:00:00 2001 +From: Wang Jiajun <Amesists@gmail.com> +Date: Sat, 11 May 2013 00:46:25 +0200 +Subject: [PATCH] Fix bug #454782 by config the user name and email + +--- + src/echangelog/test/test.sh | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/echangelog/test/test.sh b/src/echangelog/test/test.sh +index 74d815f..0559113 100755 +--- a/src/echangelog/test/test.sh ++++ b/src/echangelog/test/test.sh +@@ -12,7 +12,8 @@ _ROOT=$(pwd) + unset GENTOO_AUTHOR_NAME GENTOO_AUTHOR_EMAIL \ + GENTOO_COMMITTER_NAME GENTOO_COMMITTER_EMAIL + +-export ECHANGELOG_USER="Just a test <echangelogtest@gentoo.org>" ++export GENTOO_COMMITTER_NAME="Just a test" ++export GENTOO_COMMITTER_EMAIL="echangelogtest@gentoo.org" + + MD5_INIT="21ac109c53cf02378593a4f613b2bb55" + MD5_PATCH="f3fa1cacae3bf51d6188278e6a5fd0c6" +@@ -56,6 +57,11 @@ make_test() { + + if [ "${vcs}" = "git" ]; then + git init ++ ++ # bug 454782 ++ git config user.name "${GENTOO_COMMITTER_NAME}" ++ git config user.email "${GENTOO_COMMITTER_EMAIL}" ++ + touch .gitignore + git add .gitignore + git commit -a -m 'Initial Commit' +-- +1.8.1.5 + diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.2.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.2.ebuild index 843967d789b2..1ab933349218 100644 --- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.2.ebuild +++ b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.2.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.2.ebuild,v 1.1 2013/05/10 18:09:51 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.2.ebuild,v 1.2 2013/05/10 22:54:23 idl0r Exp $ -EAPI="3" +EAPI="5" PYTHON_DEPEND="*:2.6" PYTHON_USE_WITH="xml" -inherit python +inherit python eutils DESCRIPTION="Collection of developer scripts for Gentoo" HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml" @@ -23,6 +23,10 @@ RDEPEND="sys-apps/portage dev-lang/perl sys-apps/diffutils" +src_prepare() { + epatch "${FILESDIR}/echangelog_test.patch" +} + src_test() { # echangelog test is not able to run as root # the EUID check may not work for everybody diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild index b2afa8fd98b7..2dc4c9706be8 100644 --- a/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild +++ b/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild,v 1.9 2011/09/20 22:11:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit-dev/gentoolkit-dev-9999.ebuild,v 1.10 2013/05/10 22:54:23 idl0r Exp $ -EAPI="3" +EAPI="5" PYTHON_DEPEND="*:2.6" PYTHON_USE_WITH="xml" @@ -38,5 +38,5 @@ src_test() { } src_install() { - emake DESTDIR="${ED}" install || die + emake DESTDIR="${ED}" VERSION="${PF}" install || die } |