kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-04-22 19:13:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rc-0.14.2' of https://github.com/blockstack/blockstack-core into rc-0.14.2

Browse Source
This commit is contained in:
Jude Nelson
2017-04-12 17:16:59 -04:00
parent 928a509520 d9404b5693
commit 1698e04537
6 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
blockstack_client/rpc.py
View File

@@ -47,6 +47,7 @@ import jsonschema
import jsontokens
import subprocess
import platform
import shutil
from jsonschema import ValidationError
from schemas import *
@@ -1738,7 +1739,7 @@ class BlockstackAPIEndpointHandler(SimpleHTTPRequestHandler):
if json_is_error(namespaces):
# error
status_code = None
if json_is_exception(res):
if json_is_exception(namespaces):
status_code = 500
else:
status_code = 404
@@ -4181,7 +4182,7 @@ def local_api_action(command, password=None, api_pass=None, config_dir=blockstac
api_stdin_buf = blockstack_constants.serialize_secrets()
p = subprocess.Popen(argv, cwd=config_dir, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True, env=env)
p = subprocess.Popen(argv, cwd=config_dir, stdout=subprocess.PIPE, stdin=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True, env=env)
out, err = p.communicate(input=api_stdin_buf)
res = p.wait()
if res != 0: