瀏覽代碼

small fixes

Eran Davidovich 3 年之前
父節點
當前提交
55c8c27265
共有 2 個文件被更改,包括 5 次插入4 次删除
  1. 1 1
      third_party/pyth/p2w_autoattest.py
  2. 4 3
      third_party/pyth/pyth_utils.py

+ 1 - 1
third_party/pyth/p2w_autoattest.py

@@ -220,7 +220,7 @@ while True:
         ATTESTATIONS["pendingSeqnos"].append(seqno)
 
     else:
-        logging.warn("Warning: Could not get sequence number")
+        logging.warning("Warning: Could not get sequence number")
 
     time.sleep(P2W_ATTEST_INTERVAL)
     nonce += 1

+ 4 - 3
third_party/pyth/pyth_utils.py

@@ -41,9 +41,10 @@ def run_or_die(args, die=True, **kwargs):
     ret = subprocess.run(args, text=True, **kwargs)
 
     if ret.returncode != 0:
-        logging.error(
-            f"Return code is: {ret.returncode}\nSTDOUT: {ret.stdout}\nSTDERR: {ret.stderr}"
-        )
+        if str(ret.stdout) != '':
+            logging.info(f"STDOUT: {ret.stdout}")
+        if str(ret.stderr) != '':
+            logging.error(f"STDERR: {ret.stderr}")
         if die:
             sys.exit(ret.returncode)
         else: