dn42/registry
1
0
Fork 0
mirror of https://git.dn42.dev/dn42/registry.git synced 2025-05-06 20:55:23 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix json decode issue

Browse source
This commit is contained in:
xuu 2017-11-12 08:15:57 -07:00
parent 115a39f2b0
commit 28d12eb224
No known key found for this signature in database
GPG key ID: 8B3B0604F164E04F
3 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
check-my-stuff
View file

@ -1,4 +1,5 @@
#!/bin/sh #!/bin/sh
set -eo pipefail
if [ "$#" -eq "0" ] if [ "$#" -eq "0" ]
then then
@ -19,15 +20,3 @@ cd "$BASE" || exit 1
utils/schema-check/dn42-schema.py -v scan data/ $MNT || ( echo "Schema validation failed, please check above!" ; exit 1 ) utils/schema-check/dn42-schema.py -v scan data/ $MNT || ( echo "Schema validation failed, please check above!" ; exit 1 )
exit 0
git diff --cached --name-only | while IFS='/' read -ra LINE; do
if [[ "${LINE[0]}" = "data" ]]; then
if ! utils/schema-check/dn42-schema.py policy ${LINE[1]} ${LINE[2]} $MNT; then
echo "# This file fails policy checks. To continue with the commit revert the change."
echo "# git reset HEAD -- " ${LINE[1]}/${LINE[1]}/${LINE[2]}
echo "# git checkout -- " ${LINE[1]}/${LINE[1]}/${LINE[2]}
exit 1
fi
fi
done

1
check-pol
View file

@ -1,4 +1,5 @@
#!/bin/sh #!/bin/sh
set -eo pipefail
if [ $# -eq 0 ] if [ $# -eq 0 ]
then then

5
utils/schema-check/dn42-schema.py
View file

@ -374,7 +374,10 @@ def http_get(server, url, query=None, headers=None):
if "application/json" in req.getheader("Content-Type", "application/json"): if "application/json" in req.getheader("Content-Type", "application/json"):
if req.status > 299: if req.status > 299:
return {} return {}
return json.loads(req.read()) r = req.read()
if not isinstance(r, str):
r = r.decode("utf-8")
return json.loads(r)
if req.status > 299: if req.status > 299:
return "" return ""