| 1 |
commit: f3c05720208ba645930dfccc03ef6f5b509acf00 |
| 2 |
Author: Mu Qiao <qiaomuf <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 31 07:28:27 2011 +0000 |
| 4 |
Commit: Petteri Räty <betelgeuse <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 1 12:15:20 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/libbash.git;a=commit;h=f3c05720 |
| 7 |
|
| 8 |
Builtin: fix a bug in inherit built-in |
| 9 |
|
| 10 |
We should use space to separate each value of the global variables. Now |
| 11 |
this is fixed. |
| 12 |
|
| 13 |
--- |
| 14 |
Makefile.am | 1 + |
| 15 |
scripts/bar.eclass | 5 +++++ |
| 16 |
scripts/sunpinyin-2.0.3-r1.ebuild | 2 +- |
| 17 |
scripts/sunpinyin-2.0.3-r1.ebuild.result | 2 +- |
| 18 |
src/builtins/inherit_builtin.cpp | 2 +- |
| 19 |
5 files changed, 9 insertions(+), 3 deletions(-) |
| 20 |
|
| 21 |
diff --git a/Makefile.am b/Makefile.am |
| 22 |
index 423bcc4..e511111 100644 |
| 23 |
--- a/Makefile.am |
| 24 |
+++ b/Makefile.am |
| 25 |
@@ -237,6 +237,7 @@ EXTRA_DIST = bashast/bashast.g \ |
| 26 |
scripts/source_return.sh \ |
| 27 |
scripts/illegal_script.sh \ |
| 28 |
scripts/foo.eclass \ |
| 29 |
+ scripts/bar.eclass \ |
| 30 |
utils/metadata_diff.sh \ |
| 31 |
utils/isolated-functions.sh \ |
| 32 |
test_coverage.sh \ |
| 33 |
|
| 34 |
diff --git a/scripts/bar.eclass b/scripts/bar.eclass |
| 35 |
new file mode 100644 |
| 36 |
index 0000000..1e46230 |
| 37 |
--- /dev/null |
| 38 |
+++ b/scripts/bar.eclass |
| 39 |
@@ -0,0 +1,5 @@ |
| 40 |
+IUSE="abc def" |
| 41 |
+REQUIRED_USE="abc" |
| 42 |
+DEPEND="dev-util/pkgconfig" |
| 43 |
+RDEPEND="foo/bar" |
| 44 |
+PDEPEND="foo/bar" |
| 45 |
|
| 46 |
diff --git a/scripts/sunpinyin-2.0.3-r1.ebuild b/scripts/sunpinyin-2.0.3-r1.ebuild |
| 47 |
index 319e5ee..4b00d5a 100644 |
| 48 |
--- a/scripts/sunpinyin-2.0.3-r1.ebuild |
| 49 |
+++ b/scripts/sunpinyin-2.0.3-r1.ebuild |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
EAPI="1" |
| 52 |
|
| 53 |
-inherit foo |
| 54 |
+inherit foo bar |
| 55 |
|
| 56 |
DESCRIPTION="SunPinyin is a SLM (Statistical Language Model) based IME" |
| 57 |
HOMEPAGE="http://sunpinyin.googlecode.com" |
| 58 |
|
| 59 |
diff --git a/scripts/sunpinyin-2.0.3-r1.ebuild.result b/scripts/sunpinyin-2.0.3-r1.ebuild.result |
| 60 |
index 7c8c13b..9298df3 100644 |
| 61 |
--- a/scripts/sunpinyin-2.0.3-r1.ebuild.result |
| 62 |
+++ b/scripts/sunpinyin-2.0.3-r1.ebuild.result |
| 63 |
@@ -7,7 +7,7 @@ http://sunpinyin.googlecode.com |
| 64 |
LGPL-2.1 CDDL |
| 65 |
SunPinyin is a SLM (Statistical Language Model) based IME |
| 66 |
~amd64 ~x86 |
| 67 |
-foo |
| 68 |
+bar foo |
| 69 |
abc def |
| 70 |
abc |
| 71 |
foo/bar |
| 72 |
|
| 73 |
diff --git a/src/builtins/inherit_builtin.cpp b/src/builtins/inherit_builtin.cpp |
| 74 |
index ac11cfc..4793d5c 100644 |
| 75 |
--- a/src/builtins/inherit_builtin.cpp |
| 76 |
+++ b/src/builtins/inherit_builtin.cpp |
| 77 |
@@ -33,7 +33,7 @@ |
| 78 |
inline void inherit_builtin::append_global(const std::string& name) |
| 79 |
{ |
| 80 |
if(!_walker.is_unset_or_null(name, 0)) |
| 81 |
- _walker.set_value("E_" + name, _walker.resolve<std::string>("E_"+name) + _walker.resolve<std::string>(name)); |
| 82 |
+ _walker.set_value("E_" + name, _walker.resolve<std::string>("E_" + name) + " " + _walker.resolve<std::string>(name)); |
| 83 |
} |
| 84 |
|
| 85 |
inline void inherit_builtin::restore_global(const std::string& name, const std::string& value) |
Archives