Skip to content

Commit

Permalink
merge v7.14 & 7.15 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
kwindrem committed Apr 7, 2024
1 parent 99c487d commit 7c8ea0a
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 4 deletions.
5 changes: 4 additions & 1 deletion PackageManager.py
Original file line number Diff line number Diff line change
Expand Up @@ -2104,6 +2104,9 @@ def UpdateVersionsAndFlags (self, doConflictChecks=False):
and os.path.exists ("/data/" + packageName + "/setup"):
PushAction ( command='check' + ':' + packageName, source='AUTO' )

# if no incompatibilities found, clear incompatible reason
if compatible:
self.SetIncompatible ("")
# end UpdateVersionsAndFlags
# end Package

Expand Down Expand Up @@ -2329,7 +2332,7 @@ def run (self):
user = package.GitHubUser
branch = package.GitHubBranch
# always do the update for 'local' source
if source == 'GUI':
if source != 'GUI':
doUpdate = True
# for GUI - refresh if no version or last refresh more than 30 seconds ago
elif package.GitHubVersion == "" or time.time () > package.lastGitHubRefresh + 30:
Expand Down
2 changes: 1 addition & 1 deletion blindInstall/SetupHelperVersion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v8.0~11
v8.0~12
7 changes: 7 additions & 0 deletions changes
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ v8.0: (beta)
add TailscaleGX to default package list
fixed: PackageManager hangs if there is no setup script in package directory

v7.15:
fixed: GitHub version not refreshed when user/branch change
fixed: old blind install

v7.14:
fixed: incompatible message not cleared when package no longer incompatible

v7.13:
fixed: PackageManager doesn't install packages after firmware update

Expand Down
2 changes: 1 addition & 1 deletion updatePackage
Original file line number Diff line number Diff line change
Expand Up @@ -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 TailscaleGX ShutdownMonitor VeCanSetup RpiDisplaySetup RpiGpioSetup GuiMods"
## ExtTransferSwitch GeneratorConnector TankRepeater are obsolete and file sets should not be updated.


Expand Down
Binary file modified venus-data-UninstallPackages.tgz
Binary file not shown.
Binary file modified venus-data.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v8.0~11
v8.0~12

0 comments on commit 7c8ea0a

Please sign in to comment.