removed unused dbus parameter /InstallOk

kwindrem · Apr 5, 2024 · 99c487d · 99c487d
1 parent 2019782
commit 99c487d
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 9 deletions.
diff --git a/FileSets/VersionIndependent/PageSettingsPackageEdit.qml b/FileSets/VersionIndependent/PageSettingsPackageEdit.qml
@@ -28,14 +28,13 @@ MbPage {
 	property string incompatibleDetails: incompatibleDetailsItem.valid ? incompatibleDetailsItem.value : ""
 	property bool incompatible: incompatibleReason != ""
 	property VBusItem platform: VBusItem { bind: Utils.path(servicePrefix, "/Platform") }
-	property VBusItem installOkItem: VBusItem { bind: getServiceBind ( "InstallOk" ) }
 	property VBusItem incompatibleResolvableItem: VBusItem { bind: getServiceBind ( "IncompatibleResolvable") }
 
 	property bool gitHubValid: gitHubVersion.item.valid && gitHubVersion.item.value.substring (0,1) === "v"
 	property bool packageValid: packageVersion.item.valid && packageVersion.item.value.substring (0,1) === "v"
 	property bool installedValid: installedVersion.item.valid && installedVersion.item.value.substring (0,1) === "v"
 	property bool downloadOk: gitHubValid && gitHubVersion.item.value != ""
-	property bool installOk: (! incompatible && (installOkItem.valid && installOkItem.value == 1)) ? true : false
+	property bool installOk: ! incompatible
 	property string requestedAction: ''
 	property bool actionPending: requestedAction != ''
 	property bool waitForAction: editAction.value != '' && ! editError

diff --git a/PackageManager.py b/PackageManager.py
@@ -1427,7 +1427,6 @@ def __init__( self, section, packageName = None ):
 			self.incompatiblePath = '/Package/' + section + '/Incompatible'
 			self.incompatibleDetailsPath = '/Package/' + section + '/IncompatibleDetails'
 			self.IncompatibleResolvablePath = '/Package/' + section + '/IncompatibleResolvable'
-			self.installOkPath = '/Package/' + section + '/InstallOk'
 
 			# create service paths if they don't already exist
 			try:
@@ -1454,10 +1453,6 @@ def __init__( self, section, packageName = None ):
 				foo = DbusIf.DbusService[self.IncompatibleResolvablePath]
 			except:
 				DbusIf.DbusService.add_path (self.IncompatibleResolvablePath, "" )
-			try:
-				foo = DbusIf.DbusService[self.installOkPath]
-			except:
-				DbusIf.DbusService.add_path (self.installOkPath, "" )
 
 		self.packageNamePath = '/Settings/PackageManager/' + section + '/PackageName'
 		self.gitHubUserPath = '/Settings/PackageManager/' + section + '/GitHubUser'

diff --git a/blindInstall/SetupHelperVersion b/blindInstall/SetupHelperVersion
@@ -1 +1 @@
-v8.0~10
+v8.0~11
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 @@
-v8.0~10
+v8.0~11