Skip to content

Commit

Permalink
blank /ActionNeeded if reboot, etc pending
Browse files Browse the repository at this point in the history
  • Loading branch information
kwindrem committed May 4, 2024
1 parent 1acf174 commit 85e2a58
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
12 changes: 10 additions & 2 deletions PackageManager.py
Original file line number Diff line number Diff line change
Expand Up @@ -3667,7 +3667,7 @@ def run (self):

WaitForGitHubVersions = False

# states for actionNeeded
# states for package.ActionNeeded
REBOOT_NEEDED = 2
GUI_RESTART_NEEDED = 1
NONE = 0
Expand Down Expand Up @@ -3859,7 +3859,12 @@ def mainLoop ():
actionsNeeded += "REBOOT system ?"
elif systemAction == GUI_RESTART_NEEDED:
actionsNeeded += "restart GUI ?"
DbusIf.DbusService['/ActionNeeded'] = actionsNeeded

# don't show an action needed if reboot, etc is pending
if SystemReboot or GuiRestart or RestartPackageManager or InitializePackageManager:
DbusIf.DbusService['/ActionNeeded'] = ""
else:
DbusIf.DbusService['/ActionNeeded'] = actionsNeeded

DbusIf.UNLOCK ("mainLoop 2")

Expand Down Expand Up @@ -4187,6 +4192,7 @@ def main():
if MediaScan.AutoUninstall:
DbusIf.UpdateStatus ( message="UNINSTALLING ALL PACKAGES & REBOOTING ...", where='PmStatus')
DbusIf.UpdateStatus ( message="UNINSTALLING ALL PACKAGES & REBOOTING ...", where='Editor' )
DbusIf.DbusService['/ActionNeeded'] = ""
logging.warning (">>>> UNINSTALLING ALL PACKAGES & REBOOTING...")
SystemReboot = True

Expand All @@ -4199,10 +4205,12 @@ def main():
elif SetupHelperUninstall:
DbusIf.UpdateStatus ( "UNINSTALLING SetupHelper ...", where='PmStatus' )
DbusIf.UpdateStatus ( "UNINSTALLING SetupHelper ...", where='Editor' )
DbusIf.DbusService['/ActionNeeded'] = ""
logging.critical (">>>> UNINSTALLING SetupHelper ...")
elif SystemReboot:
DbusIf.UpdateStatus ( message="REBOOTING SYSTEM ...", where='PmStatus')
DbusIf.UpdateStatus ( message="REBOOTING SYSTEM ...", where='Editor' )
DbusIf.DbusService['/ActionNeeded'] = ""
logging.warning (">>>> REBOOTING SYSTEM")

# remaining tasks are handled in packageManagerEnd.sh because
Expand Down
2 changes: 1 addition & 1 deletion blindInstall/SetupHelperVersion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v8.0~31
v8.0~32
Binary file added venus-data-UninstallPackages.tgz
Binary file not shown.
Binary file added venus-data.tgz
Binary file not shown.

0 comments on commit 85e2a58

Please sign in to comment.