June 2018 - tor-commits - lists.torproject.org

[tor/maint-0.3.3] Fix a bug in my fix for #26258
by nickm＠torproject.org 16 Jun '18

16 Jun '18

commit ccf1eb3164a48de042dfdd8712f4b788bfefdc49 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 16 13:08:40 2018 -0400 Fix a bug in my fix for #26258 The fix here is use a different bourne shell subsitution for CARGO_ONLINE, so that an empty string counts as set. --- src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 8e8d29b89..95ffc2e65 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -9,7 +9,7 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do cd "${cargo_toml_dir}" && \ CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ - "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE:-"--frozen"} \ + "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ ${EXTRA_CARGO_OPTIONS} \ --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 fi

1 0

[tor/master] Fix a bug in my fix for #26258
by nickm＠torproject.org 16 Jun '18

16 Jun '18

commit ccf1eb3164a48de042dfdd8712f4b788bfefdc49 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 16 13:08:40 2018 -0400 Fix a bug in my fix for #26258 The fix here is use a different bourne shell subsitution for CARGO_ONLINE, so that an empty string counts as set. --- src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 8e8d29b89..95ffc2e65 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -9,7 +9,7 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do cd "${cargo_toml_dir}" && \ CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ - "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE:-"--frozen"} \ + "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ ${EXTRA_CARGO_OPTIONS} \ --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 fi

1 0

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 16 Jun '18

16 Jun '18

commit 8184f45ad94b5305c519f427a503d14ecb2f12dd Merge: 71ddfbaad ccf1eb316 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 16 13:10:19 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.3.4] Fix a bug in my fix for #26258
by nickm＠torproject.org 16 Jun '18

16 Jun '18

commit ccf1eb3164a48de042dfdd8712f4b788bfefdc49 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 16 13:08:40 2018 -0400 Fix a bug in my fix for #26258 The fix here is use a different bourne shell subsitution for CARGO_ONLINE, so that an empty string counts as set. --- src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 8e8d29b89..95ffc2e65 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -9,7 +9,7 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do cd "${cargo_toml_dir}" && \ CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ - "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE:-"--frozen"} \ + "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ ${EXTRA_CARGO_OPTIONS} \ --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 fi

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 16 Jun '18

16 Jun '18

commit 8184f45ad94b5305c519f427a503d14ecb2f12dd Merge: 71ddfbaad ccf1eb316 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 16 13:10:19 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 16 Jun '18

16 Jun '18

commit 1de722d7a911d0814078d7b370bc536e4db8f37c Merge: 5cb45d2c7 8184f45ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 16 13:10:19 2018 -0400 Merge branch 'maint-0.3.4' src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 16 Jun '18

16 Jun '18

commit 8184f45ad94b5305c519f427a503d14ecb2f12dd Merge: 71ddfbaad ccf1eb316 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 16 13:10:19 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.4] Fix a bug in my fix for #26258
by nickm＠torproject.org 16 Jun '18

16 Jun '18

commit ccf1eb3164a48de042dfdd8712f4b788bfefdc49 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 16 13:08:40 2018 -0400 Fix a bug in my fix for #26258 The fix here is use a different bourne shell subsitution for CARGO_ONLINE, so that an empty string counts as set. --- src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 8e8d29b89..95ffc2e65 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -9,7 +9,7 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do cd "${cargo_toml_dir}" && \ CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ - "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE:-"--frozen"} \ + "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ ${EXTRA_CARGO_OPTIONS} \ --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 fi

1 0

[tor/release-0.3.3] Fix a bug in my fix for #26258
by nickm＠torproject.org 16 Jun '18

16 Jun '18

commit ccf1eb3164a48de042dfdd8712f4b788bfefdc49 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 16 13:08:40 2018 -0400 Fix a bug in my fix for #26258 The fix here is use a different bourne shell subsitution for CARGO_ONLINE, so that an empty string counts as set. --- src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 8e8d29b89..95ffc2e65 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -9,7 +9,7 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do cd "${cargo_toml_dir}" && \ CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ - "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE:-"--frozen"} \ + "${CARGO:-cargo}" test --all-features ${CARGO_ONLINE-"--frozen"} \ ${EXTRA_CARGO_OPTIONS} \ --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1 fi

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 16 Jun '18

16 Jun '18

commit c134ccfac63682914c9d317acd4cea99602ce951 Merge: 6ea38c4b5 ccf1eb316 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 16 13:10:19 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/test/test_rust.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0