From c17c3f9a8a316c9b2aa6fbe8197f46300150ca3f Mon Sep 17 00:00:00 2001 From: fabian <fabians@gmail.com> Date: Mon, 9 May 2016 17:25:28 +0100 Subject: [PATCH 1/2] Second attempt at fixing sh_binary. --- src/parse/rules/sh_rules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/parse/rules/sh_rules.py b/src/parse/rules/sh_rules.py index 488ad53a6e..cc6836cd50 100644 --- a/src/parse/rules/sh_rules.py +++ b/src/parse/rules/sh_rules.py @@ -69,7 +69,7 @@ def sh_binary(name, main, deps=None, visibility=None): # Inject the tar ball boundary. 'echo "%s" >> $OUT' % (_SH_BINARY_TMPL_SUFFIX % tmpl_vars), # Compress the dependent files and dump out into the bash script. - 'find $TMP_DIR -type f | grep -v $SRCS | grep -v $OUT | sed "s/^\.\///g" | tar zc -f - --files-from - >> $OUT', + 'find . -type f | grep -v $SRCS | grep -v $(echo $OUT | sed "s/$TMP_DIR//g") | sed "s/^\.\///g" | tar zc -f - --files-from - >> $OUT', ]) build_rule( From d0a2e43a5db7136852d87afe8d5f67bb54a285b6 Mon Sep 17 00:00:00 2001 From: fabian <fabians@gmail.com> Date: Mon, 9 May 2016 17:28:32 +0100 Subject: [PATCH 2/2] Bump version and changelog --- ChangeLog | 4 ++++ VERSION | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7a511d78af..bf50e86c6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Version 2.1.2 +------------- + * Fixes one more bug with sh_binary where paths were taken to be relative when they were absolute. + Version 2.1.1 ------------- * Fixes bug with sh_binary not ignoring the main script properly when generating the tarball. diff --git a/VERSION b/VERSION index 3e3c2f1e5e..eca07e4c1a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.1 +2.1.2