aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-03-08 22:51:00 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-03-08 22:51:00 +0000
commit6c5c2331edd37acab6a1356302ad0adf2bd87dd9 (patch)
treede18748a2e72dfa279ea377583f6bd0b61a9bc3d
parentbf204abd144704f5d97a7915a71914ca0e7e7914 (diff)
downloadpaludis-6c5c2331edd37acab6a1356302ad0adf2bd87dd9.tar.gz
paludis-6c5c2331edd37acab6a1356302ad0adf2bd87dd9.tar.xz
Fix quoting bug
-rw-r--r--NEWS9
-rwxr-xr-xpaludis/repositories/e/ebuild/pipe_functions.bash4
2 files changed, 10 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index b5525a3..02060bd 100644
--- a/NEWS
+++ b/NEWS
@@ -4,9 +4,16 @@ News for Paludis
This file lists the major changes between versions. For a more detailed list
of every change, see the ChangeLog.
-trunk/:
+0.26.0_alpha12:
* The merger is able to detect hardlinks and tries to merge them as such.
+ * We're even less strict about environment checking from VDB, to avoid
+ issues with packages installed several years ago when USE_EXPAND didn't
+ include KERNEL etc.
+
+ * Fixed a quoting bug that would result in unwanted wildcard expansion
+ when rewriting *DEPEND values.
+
0.26.0_alpha11:
* paludis --owner now shows matching files when --full-match is not
specified.
diff --git a/paludis/repositories/e/ebuild/pipe_functions.bash b/paludis/repositories/e/ebuild/pipe_functions.bash
index dc9112c..6403e64 100755
--- a/paludis/repositories/e/ebuild/pipe_functions.bash
+++ b/paludis/repositories/e/ebuild/pipe_functions.bash
@@ -74,8 +74,8 @@ paludis_pipe_command()
paludis_rewrite_var()
{
[[ "${#@}" -ne 3 ]] && die "$0 should take exactly three args"
- local r=$(paludis_pipe_command REWRITE_VAR "$EAPI" "$1" "$2" "$3" )
- echo ${r#*;}
+ local r="$(paludis_pipe_command REWRITE_VAR "$EAPI" "$1" "$2" "$3" )"
+ echo "${r#*;}"
return ${r%%;*}
}