From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QRkPB-000253-RD for garchives@archives.gentoo.org; Wed, 01 Jun 2011 12:20:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DEC2B1C0E7; Wed, 1 Jun 2011 12:19:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 897561C090 for ; Wed, 1 Jun 2011 12:19:52 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 198FE1B4007 for ; Wed, 1 Jun 2011 12:19:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7E28A80506 for ; Wed, 1 Jun 2011 12:19:51 +0000 (UTC) From: "Petteri Räty" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Petteri Räty" Message-ID: Subject: [gentoo-commits] proj/libbash:master commit in: scripts/, /, src/builtins/ X-VCS-Repository: proj/libbash X-VCS-Files: Makefile.am scripts/bar.eclass scripts/sunpinyin-2.0.3-r1.ebuild scripts/sunpinyin-2.0.3-r1.ebuild.result src/builtins/inherit_builtin.cpp X-VCS-Directories: scripts/ / src/builtins/ X-VCS-Committer: betelgeuse X-VCS-Committer-Name: Petteri Räty X-VCS-Revision: f3c05720208ba645930dfccc03ef6f5b509acf00 Date: Wed, 1 Jun 2011 12:19:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: e7c581d0e13d533db401d315f1a0b719 commit: f3c05720208ba645930dfccc03ef6f5b509acf00 Author: Mu Qiao gentoo org> AuthorDate: Tue May 31 07:28:27 2011 +0000 Commit: Petteri R=C3=A4ty gentoo org> CommitDate: Wed Jun 1 12:15:20 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/libbash.git;a= =3Dcommit;h=3Df3c05720 Builtin: fix a bug in inherit built-in We should use space to separate each value of the global variables. Now this is fixed. --- Makefile.am | 1 + scripts/bar.eclass | 5 +++++ scripts/sunpinyin-2.0.3-r1.ebuild | 2 +- scripts/sunpinyin-2.0.3-r1.ebuild.result | 2 +- src/builtins/inherit_builtin.cpp | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 423bcc4..e511111 100644 --- a/Makefile.am +++ b/Makefile.am @@ -237,6 +237,7 @@ EXTRA_DIST =3D bashast/bashast.g \ scripts/source_return.sh \ scripts/illegal_script.sh \ scripts/foo.eclass \ + scripts/bar.eclass \ utils/metadata_diff.sh \ utils/isolated-functions.sh \ test_coverage.sh \ diff --git a/scripts/bar.eclass b/scripts/bar.eclass new file mode 100644 index 0000000..1e46230 --- /dev/null +++ b/scripts/bar.eclass @@ -0,0 +1,5 @@ +IUSE=3D"abc def" +REQUIRED_USE=3D"abc" +DEPEND=3D"dev-util/pkgconfig" +RDEPEND=3D"foo/bar" +PDEPEND=3D"foo/bar" diff --git a/scripts/sunpinyin-2.0.3-r1.ebuild b/scripts/sunpinyin-2.0.3-= r1.ebuild index 319e5ee..4b00d5a 100644 --- a/scripts/sunpinyin-2.0.3-r1.ebuild +++ b/scripts/sunpinyin-2.0.3-r1.ebuild @@ -1,6 +1,6 @@ EAPI=3D"1" =20 -inherit foo +inherit foo bar =20 DESCRIPTION=3D"SunPinyin is a SLM (Statistical Language Model) based IME= " HOMEPAGE=3D"http://sunpinyin.googlecode.com" diff --git a/scripts/sunpinyin-2.0.3-r1.ebuild.result b/scripts/sunpinyin= -2.0.3-r1.ebuild.result index 7c8c13b..9298df3 100644 --- a/scripts/sunpinyin-2.0.3-r1.ebuild.result +++ b/scripts/sunpinyin-2.0.3-r1.ebuild.result @@ -7,7 +7,7 @@ http://sunpinyin.googlecode.com LGPL-2.1 CDDL SunPinyin is a SLM (Statistical Language Model) based IME ~amd64 ~x86 -foo +bar foo abc def abc foo/bar diff --git a/src/builtins/inherit_builtin.cpp b/src/builtins/inherit_buil= tin.cpp index ac11cfc..4793d5c 100644 --- a/src/builtins/inherit_builtin.cpp +++ b/src/builtins/inherit_builtin.cpp @@ -33,7 +33,7 @@ inline void inherit_builtin::append_global(const std::string& name) { if(!_walker.is_unset_or_null(name, 0)) - _walker.set_value("E_" + name, _walker.resolve("E_"+n= ame) + _walker.resolve(name)); + _walker.set_value("E_" + name, _walker.resolve("E_" += name) + " " + _walker.resolve(name)); } =20 inline void inherit_builtin::restore_global(const std::string& name, con= st std::string& value)