Skip to content

Commit

Permalink
Update fmt15 dependency. (#2118)
Browse files Browse the repository at this point in the history
Contains a formatting fix:
kormat/fmt15@ee69fec

Also:
- Update an acceptance test that expected the quotes produced by the
  formatting bug.
- Fix an issue where `scion.sh stop` would exit non-zero if one of the /dev/shm dirs
  didn't exist.
  • Loading branch information
kormat authored Nov 12, 2018
1 parent 70900a5 commit 913e967
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .buildkite/setup.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- label: Prepare scion_base and scion images
command:
- ./tools/ci/prepare_image d0e8b00ee1907f599e77b4ac677ab58740ad48c35ff235c516aaf1ee1d74cbef
- ./tools/ci/prepare_image d1706fb3c9c8eacdc9a91ddeac7c3ac1ad815fe43fc81bd50a280b3738ce7569
- ./docker.sh build
concurrency: 1
concurrency_group: "build-scion"
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
command: ./tools/ci/docker_update
- run:
name: Pull and tag scion_base image
command: ./tools/ci/prepare_image d0e8b00ee1907f599e77b4ac677ab58740ad48c35ff235c516aaf1ee1d74cbef
command: ./tools/ci/prepare_image d1706fb3c9c8eacdc9a91ddeac7c3ac1ad815fe43fc81bd50a280b3738ce7569
when: always
- run:
name: Build scion:latest image
Expand Down
2 changes: 1 addition & 1 deletion acceptance/topo_sd_reloads_cs_acceptance/test
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ test_run() {
sleep 1
bin/showpaths -srcIA $SRC_IA -dstIA $DST_IA -sciondFromIA -refresh || true
sleep 2
grep -q "\[TRACE\] \[Messenger\] Sending request.*req_type=\"ChainRequest\".*$SRC_IA,\[127\.42\.42\.42\]:39999" "logs/sd$SRC_IA_FILE.log" || \
grep -q "\[TRACE\] \[Messenger\] Sending request .*req_type=ChainRequest .*$SRC_IA,\[127\.42\.42\.42\]:39999" "logs/sd$SRC_IA_FILE.log" || \
{ echo "Certificate chain request to 127.42.42.42:39999 not found in logs"; return 1; }
}

Expand Down
6 changes: 3 additions & 3 deletions go/vendor/vendor.json
Original file line number Diff line number Diff line change
Expand Up @@ -213,11 +213,11 @@
"revisionTime": "2018-02-21T18:54:26Z"
},
{
"checksumSHA1": "eiKZJz+wsoOmDZQ7xdpX+sqQte4=",
"checksumSHA1": "GcNSG4GpHNO3w145a7jfm37ATRk=",
"license": "APL 2.0",
"path": "github.com/kormat/fmt15",
"revision": "aeb535ae78961b7591ea7f7740b74fc6560c88a8",
"revisionTime": "2016-11-22T15:41:03Z"
"revision": "ee69fecb2656a4de8ac47df338ad7e7f9e056dd5",
"revisionTime": "2018-11-12T14:05:56Z"
},
{
"checksumSHA1": "2RFzGcdTeQrFkkhT70WhQcMWF6c=",
Expand Down
4 changes: 3 additions & 1 deletion scion.sh
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,9 @@ cmd_stop() {
python/integration/set_ipv6_addr.py -d
fi
for i in /run/shm/{dispatcher,sciond}/; do
[ -e "$i" ] && find "$i" -xdev -mindepth 1 -print0 | xargs -r0 rm -v
if [ -e "$i" ]; then
find "$i" -xdev -mindepth 1 -print0 | xargs -r0 rm -v
fi
done
}

Expand Down

0 comments on commit 913e967

Please sign in to comment.