fixed: PackageManager hangs with package add

kwindrem · Apr 12, 2024 · a89f05d · a89f05d
1 parent 4fed088
commit a89f05d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/PackageManager.py b/PackageManager.py
@@ -1161,7 +1161,7 @@ def LOCK (self, name):
 				currentTime = time.time()
 				# waiting for 5 seconds - timeout
 				if currentTime - requestTime > 5.0:
-					logging.CRITICAL ("timeout waiting for lock " + name + " - restarting PackageManager")
+					logging.critical ("timeout waiting for lock " + name + " - restarting PackageManager")
 					os._exit(1)		
 				# report waiting every 1 second
 				elif currentTime - reportTime > 0.5:
@@ -2062,13 +2062,15 @@ def UpdateVersionsAndFlags (self, doConflictChecks=False):
 						details += conflict [0] + " must not be installed\n"
 					else:
 						conflictPackage = PackageClass.LocatePackage (conflict[0])
-						if conflictPackage.PackageVersion != "":
+						if conflictPackage == None:
+							details += conflict [0] + " not available\n"
+							resolveOk = False
+						elif conflictPackage.PackageVersion != "":
 							details += conflict [0] + " must be installed\n"
 						elif conflictPackage.GitHubVersion != "":
 							details += conflict [0] + " must be downloaded and installed\n"
 						else:
-							details += conflict [0] + " not available\n"
-							resolveOk = False
+							details += conflict [0] + " unknown\n"
 				self.SetIncompatible ("package conflict", details, resolvable=resolveOk)
 				compatible = False
 			else:

diff --git a/blindInstall/SetupHelperVersion b/blindInstall/SetupHelperVersion
@@ -1 +1 @@
-v7.15
+v7.16
diff --git a/changes b/changes
@@ -1,3 +1,6 @@
+v7.16:
+	fixed: PackageManager hangs with package add
+
 v7.15:
 	fixed: GitHub version not refreshed when user/branch change
 	fixed: old blind install

diff --git a/updatePackage b/updatePackage
@@ -88,7 +88,7 @@
 #	for this reason, preserving the working copy is recommended if errors are expected
 
 # set allPackages to all packages this script should evalueate if no options are included
-allPackages="SetupHelper GuiMods ShutdownMonitor VeCanSetup RpiDisplaySetup RpiGpioSetup"
+allPackages="SetupHelper TailScale ShutdownMonitor VeCanSetup RpiDisplaySetup RpiGpioSetup GuiMods"
 ## ExtTransferSwitch GeneratorConnector TankRepeater are obsolete and file sets should not be updated.
 
 

diff --git a/venus-data-UninstallPackages.tgz b/venus-data-UninstallPackages.tgz
diff --git a/venus-data.tgz b/venus-data.tgz
diff --git a/version b/version
@@ -1 +1 @@
-v7.15
+v7.16