Skip to content

Commit

Permalink
fixed: PackageManager hangs with package add
Browse files Browse the repository at this point in the history
  • Loading branch information
kwindrem committed Apr 12, 2024
1 parent 7144ded commit be26b78
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
10 changes: 6 additions & 4 deletions PackageManager.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -2049,13 +2049,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:
Expand Down
1 change: 1 addition & 0 deletions changes
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ v8.0: (beta)
multiple patch files for each active file are permitted
add TailscaleGX to default package list
fixed: PackageManager hangs if there is no setup script in package directory
fixed: PackageManager hangs with package add

v7.15:
fixed: GitHub version not refreshed when user/branch change
Expand Down
Binary file removed venus-data-UninstallPackages.tgz
Binary file not shown.
Binary file removed 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~13
v8.0~14

0 comments on commit be26b78

Please sign in to comment.