GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 01:28:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

CURA-5528 Prevent crashes when there is a problem deleting some files in

Browse Source 
a package.
This commit is contained in:
Diego Prado Gesto 2018-07-02 13:08:51 +02:00
parent 56c7c6f2b2
commit 77e7a99d09
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cura/CuraPackageManager.py
View File

@ -94,10 +94,15 @@ class CuraPackageManager(QObject):
# (for initialize) Removes all packages that have been scheduled to be removed.
def _removeAllScheduledPackages(self) -> None:
remove_failures = []
for package_id in self._to_remove_package_set:
self._purgePackage(package_id)
del self._installed_package_dict[package_id]
self._to_remove_package_set.clear()
try:
self._purgePackage(package_id)
del self._installed_package_dict[package_id]
except:
remove_failures.append(package_id)
Logger.log("e", "There was an error uninstalling the package {package}".format(package = package_id))
self._to_remove_package_set = remove_failures
self._saveManagementData()
# (for initialize) Installs all packages that have been scheduled to be installed.
@ -279,7 +284,9 @@ class CuraPackageManager(QObject):
def isUserInstalledPackage(self, package_id: str):
return package_id in self._installed_package_dict
# Removes everything associated with the given package ID.
## Removes everything associated with the given package ID.
# \return It may produce an exception if the user has no permissions to delete this files (on Windows).
# This exception must be catched.
def _purgePackage(self, package_id: str) -> None:
# Iterate through all directories in the data storage directory and look for sub-directories that belong to
# the package we need to remove, that is the sub-dirs with the package_id as names, and remove all those dirs.
@ -302,7 +309,11 @@ class CuraPackageManager(QObject):
Logger.log("i", "Installing package [%s] from file [%s]", package_id, filename)
# remove it first and then install
self._purgePackage(package_id)
try:
self._purgePackage(package_id)
except:
Logger.log("e", "There was an error deleting the package {package} during updating.".format(package = package_id))
return
if not os.path.exists(filename):
Logger.log("w", "Package [%s] file '%s' is missing, cannot install this package", package_id, filename)