From b229fe2d7141a6ecb829bf341e587224ba3b8221 Mon Sep 17 00:00:00 2001 From: Laurence Tratt Date: Tue, 7 Nov 2023 12:05:27 +0000 Subject: [PATCH 1/2] Use a better check for "has cargo deny been installed or not". --- .buildbot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildbot.sh b/.buildbot.sh index 21c1eb9..08b9056 100644 --- a/.buildbot.sh +++ b/.buildbot.sh @@ -18,7 +18,7 @@ PREFIX=test_install make install test -f test_install/bin/snare which cargo-deny | cargo install cargo-deny || true -if [ "X`which cargo-deny`" != "X"]; then +if cargo deny --version 2>&1 > /dev/null; then cargo-deny check license else echo "Warning: couldn't run cargo-deny" > /dev/stderr From 941943d48ee40ddb88b4c9ab2889111dc13c97a5 Mon Sep 17 00:00:00 2001 From: Laurence Tratt Date: Tue, 7 Nov 2023 12:23:10 +0000 Subject: [PATCH 2/2] Accept the CC-PDDC licence. --- deny.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/deny.toml b/deny.toml index fb55cc5..51ada7f 100644 --- a/deny.toml +++ b/deny.toml @@ -5,6 +5,7 @@ allow = [ "0BSD", "Apache-2.0", "BSD-3-Clause", + "CC-PDDC", "MIT", "Unicode-DFS-2016", "Unlicense"