fixed: PackageManager hangs on remove; fixed: PackageManager not sett…

…ing no file set for incomplete fs
kwindrem · Feb 15, 2024 · 2e50b48 · 2e50b48
1 parent 701a077
commit 2e50b48
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/PackageManager.py b/PackageManager.py
@@ -1778,7 +1778,6 @@ def RemovePackage (cls, packageName=None, packageIndex=None ):
 				toPackage.InstallPending = fromPackage.InstallPending
 				toPackage.AutoInstallOk = fromPackage.AutoInstallOk
 				toPackage.FileSetOk = fromPackage.FileSetOk
-				toPackage.AutoRemove = fromPackage.AutoRemove
 
 				toIndex += 1
 				fromIndex += 1
@@ -1898,6 +1897,8 @@ def UpdateVersionsAndFlags (self):
 		flagFile = packageDir + "/FileSets/" + VenusVersion + "/INCOMPLETE"
 		if os.path.exists (flagFile):
 			self.FileSetOk = False
+			self.SetIncompatible ('NO_FILE_SET')
+			incompatible = True
 		else:
 			self.FileSetOk = True
 
@@ -3527,7 +3528,6 @@ def mainLoop():
 			if not packageOperationOk:
 				packageChecksSkipped = True
 
-
 			if installOk:
 				actionMessage = "installing " + packageName + " ..."
 				PushAction ( command='install' + ':' + packageName, source='AUTO' )

diff --git a/blindInstall/SetupHelperVersion b/blindInstall/SetupHelperVersion
@@ -1 +1 @@
-v6.5
+v6.6
diff --git a/changes b/changes
@@ -1,3 +1,7 @@
+v6.6:
+	fixed: PackageManager hangs on remove
+	fixed: PackageManager not setting no file set for incomplete fs
+
 v6.5:
 	fixed: package download failure not always reported on the GUI
 

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 @@
-v6.5
+v6.6