Merge branch 'Developer' into Python3.11

lib/python/Components/OnlineUpdateCheck.py

@@ -98,10 +98,10 @@ def getFeedStatus(self):
 					except:
 						print("[OnlineUpdateCheck][getFeedStatus] ERROR:", sys.exc_info()[0])
 						trafficLight = -2
-				if SystemInfo["imagetype"] == "developer" and "openbhdev" in SystemInfo["feedsurl"]:
+				elif SystemInfo["imagetype"] == "developer" and "openbhdev" in SystemInfo["feedsurl"]:
 					print("[OnlineUpdateCheck][getFeedStatus] Official developer feeds")
 					trafficLight = "developer"
-				elif officialReleaseFeedsUri not in SystemInfo["feedsurl"]:  # if not using official feeds mark as alien. There is no status test for alien feeds (including official developer feeds).
+				else:  # if not using official feeds mark as alien. There is no status test for alien feeds (including official developer feeds).
 					print("[OnlineUpdateCheck][getFeedStatus] Alien feeds url: %s" % SystemInfo["feedsurl"])
 					status = 0
 					trafficLight = "alien"
@@ -249,7 +249,7 @@ def createCheckJob(self):
 
 	def JobStart(self):
 		config.softwareupdate.updatefound.setValue(False)
-		if (SystemInfo["imagetype"] != "release" and feedsstatuscheck.getFeedsBool() == "unknown") or (SystemInfo["imagetype"] == "release" and feedsstatuscheck.getFeedsBool() in ("stable", "unstable")):
+		if feedsstatuscheck.getFeedsBool() in ("alien", "developer", "stable", "unstable"):
 			print("[OnlineUpdateCheckPoller] Starting background check.")
 			feedsstatuscheck.startCheck()
 		else: