From e1669c2f4bec174ea29725430640bbbca950ff4c Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Tue, 30 Jun 2009 02:55:41 +0300 Subject: Use ASCII RS for separating options in DH_INTERNAL_OPTIONS. Since now extra options via dh command line arguments are encouraged, dh will break when a bit more complex option gets added to DH_INTERNAL_OPTIONS and it gets misparsed by the debhelper command called from the override. E.g. debian/rules: | %: | dh --builddirectory="build dir" | | override_dh_install: | dh_install Will fail with something like: | .... | make[1]: Entering directory `............' | dh_install | cp: cannot stat `debian/tmp/dir': No such file or directory | dh_install: cp returned exit code 1 | make[1]: *** [override_dh_install] Error 1 So since DH_INTERNAL_OPTIONS is exclusively for internal use, why not to use an old good ASCII unrepresentable control character as a separator? So I chose ASCII 1E - RS Record Separator. Signed-off-by: Modestas Vainius --- dh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dh') diff --git a/dh b/dh index 4ea69b25..c34a5a02 100755 --- a/dh +++ b/dh @@ -462,7 +462,7 @@ sub run { $override_command=$command; # This passes the options through to commands called # inside the target. - $ENV{DH_INTERNAL_OPTIONS}=join(" ", @options); + $ENV{DH_INTERNAL_OPTIONS}=join("\x1e", @options); $command="debian/rules"; @options="override_".$override_command; } -- cgit v1.2.3