fix(reliability): pool size counts any whitespace; deploy ZIP var remote-expands
This commit is contained in:
@@ -12,7 +12,7 @@ def _pool_size():
|
|||||||
['uci', 'get', 'pineapd.@ssidpool[0].ssid'])
|
['uci', 'get', 'pineapd.@ssidpool[0].ssid'])
|
||||||
if rc != 0 or not (out or '').strip():
|
if rc != 0 or not (out or '').strip():
|
||||||
return 0
|
return 0
|
||||||
return len([s for s in out.strip().split('\n') if s])
|
return len(out.split())
|
||||||
|
|
||||||
|
|
||||||
def reconcile(clear_pool=True):
|
def reconcile(clear_pool=True):
|
||||||
|
|||||||
+1
-1
@@ -195,7 +195,7 @@ REMOTE_PAYLOAD_DIR="user/$PAYLOAD_CATEGORY/$PAYLOAD_KEY"
|
|||||||
RELEASE_TS="$(date +%Y%m%d-%H%M%S)"
|
RELEASE_TS="$(date +%Y%m%d-%H%M%S)"
|
||||||
REMOTE_COMMAND="set -e
|
REMOTE_COMMAND="set -e
|
||||||
STAGE_DIR='/tmp/mk8-stage'
|
STAGE_DIR='/tmp/mk8-stage'
|
||||||
ZIP='\$STAGE_DIR/$ZIP_NAME'
|
ZIP="\$STAGE_DIR/$ZIP_NAME"
|
||||||
RELDIR='/mmc/mk8/releases/$RELEASE_TS'
|
RELDIR='/mmc/mk8/releases/$RELEASE_TS'
|
||||||
PAYDIR='$REMOTE_PAYLOAD_DIR'
|
PAYDIR='$REMOTE_PAYLOAD_DIR'
|
||||||
LIVE=\"/root/payloads/\$PAYDIR\"
|
LIVE=\"/root/payloads/\$PAYDIR\"
|
||||||
|
|||||||
Reference in New Issue
Block a user