[gentoo-commits] proj/libbash:master commit in: scripts/, /, src/builtins/

[gentoo-commits] proj/libbash:master commit in: scripts/, /, src/builtins/

[Petteri Räty]

commit:     f3c05720208ba645930dfccc03ef6f5b509acf00
Author:     Mu Qiao <qiaomuf <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 07:28:27 2011 +0000
Commit:     Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 12:15:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=f3c05720

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 = 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="abc def"
+REQUIRED_USE="abc"
+DEPEND="dev-util/pkgconfig"
+RDEPEND="foo/bar"
+PDEPEND="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="1"
 
-inherit foo
+inherit foo bar
 
 DESCRIPTION="SunPinyin is a SLM (Statistical Language Model) based IME"
 HOMEPAGE="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_builtin.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<std::string>("E_"+name) + _walker.resolve<std::string>(name));
+      _walker.set_value("E_" + name, _walker.resolve<std::string>("E_" + name) + " " + _walker.resolve<std::string>(name));
 }
 
 inline void inherit_builtin::restore_global(const std::string& name, const std::string& value)