diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/linux/ogOperations.py | 5 | ||||
| -rw-r--r-- | src/ogRest.py | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/linux/ogOperations.py b/src/linux/ogOperations.py index 385fd95..505894b 100644 --- a/src/linux/ogOperations.py +++ b/src/linux/ogOperations.py @@ -84,7 +84,10 @@ def software(request, path, ogRest): def hardware(path, ogRest): try: - ogRest.proc = subprocess.Popen([OG_PATH + 'interfaceAdm/InventarioHardware', path], stdout=subprocess.PIPE, shell=True) + cmd = [OG_PATH + 'interfaceAdm/InventarioHardware ' + path] + ogRest.proc = subprocess.Popen(cmd, + stdout=subprocess.PIPE, + shell=True) (output, error) = ogRest.proc.communicate() except: raise ValueError('Error: Incorrect command value') diff --git a/src/ogRest.py b/src/ogRest.py index febf529..781fb80 100644 --- a/src/ogRest.py +++ b/src/ogRest.py @@ -131,9 +131,9 @@ class ogThread(): jsonResp = jsonResponse() f = open(path, "r") - lines = f.readlines() + text = f.read() f.close() - jsonResp.addElement('hardware', lines[0]) + jsonResp.addElement('hardware', text) response = restResponse(ogResponses.OK, jsonResp) client.send(response.get()) |