Continued:

- handled unregistered instances

diff --git a/fba/commands.py b/fba/commands.py
index 8da03313c5b44c637a1e94ecfff87a51d5767203..ade8fc42d08cbe0c666220c926d51b5d1c35d23d 100644 (file)
--- a/fba/commands.py
+++ b/fba/commands.py
@@ -982,10 +982,10 @@ def fetch_instances(args: argparse.Namespace) -> int:
     logger.info("Checking %d entries ...", len(rows))
     for row in rows:
         logger.debug("row[domain]='%s',row[origin]='%s',row[software]='%s'", row["domain"], row["origin"], row["software"])
-        if row["software"] is None:
+        if instances.is_registered(row["domain"]) and row["software"] is None:
             logger.warning("row[domain]='%s' has no software detected. You can try to run ./fba.py update_nodeinfo --domain=%s --force to get it updated - SKIPPED!", row["domain"], row["domain"])
             continue
-        elif software_helper.is_relay(row["software"]):
+        elif instances.is_registered(row["domain"]) and software_helper.is_relay(row["software"]):
             logger.warning("row[domain]='%s' is of software type '%s' which is not supported by this command. Please invoke fetch_relays instead - SKIPPED!", row["domain"], row["software"])
             continue