3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/3.4'

Browse source
This commit is contained in:
Lipu Fei 2018-06-05 13:34:04 +02:00
commit 6818342b90
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cura/CuraPackageManager.py
View file

@ -105,7 +105,6 @@ class CuraPackageManager(QObject):
while self._to_install_package_dict: while self._to_install_package_dict:
package_id, package_info = list(self._to_install_package_dict.items())[0] package_id, package_info = list(self._to_install_package_dict.items())[0]
self._installPackage(package_info) self._installPackage(package_info)
self._installed_package_dict[package_id] = self._to_install_package_dict[package_id]
del self._to_install_package_dict[package_id] del self._to_install_package_dict[package_id]
self._saveManagementData() self._saveManagementData()
@ -307,9 +306,8 @@ class CuraPackageManager(QObject):
Logger.log("i", "Installing package [%s] from file [%s]", package_id, filename) Logger.log("i", "Installing package [%s] from file [%s]", package_id, filename)
# If it's installed, remove it first and then install # remove it first and then install
if package_id in self._installed_package_dict: self._purgePackage(package_id)
self._purgePackage(package_id)
# Install the package # Install the package
with zipfile.ZipFile(filename, "r") as archive: with zipfile.ZipFile(filename, "r") as archive:
@ -334,6 +332,8 @@ class CuraPackageManager(QObject):
# Remove the file # Remove the file
os.remove(filename) os.remove(filename)
# Move the info to the installed list of packages only when it succeeds
self._installed_package_dict[package_id] = self._to_install_package_dict[package_id]
def __installPackageFiles(self, package_id: str, src_dir: str, dst_dir: str) -> None: def __installPackageFiles(self, package_id: str, src_dir: str, dst_dir: str) -> None:
Logger.log("i", "Moving package {package_id} from {src_dir} to {dst_dir}".format(package_id=package_id, src_dir=src_dir, dst_dir=dst_dir)) Logger.log("i", "Moving package {package_id} from {src_dir} to {dst_dir}".format(package_id=package_id, src_dir=src_dir, dst_dir=dst_dir))