Reinstall/redownload package with a new `-f, --force` option // Resolve #778

This commit is contained in:
Ivan Kravets committed 2017-12-19 00:51:35 +02:00
1 parent 31814b5122
commit 5dd97a35cc
7 files changed
+75 -33

No files matched your search

+22 -7
View File
@@ -240,7 +240,8 @@ class LibraryManager(BasePkgManager):
requirements=None,
silent=False,
trigger_event=True,
interactive=False):
interactive=False,
force=False):
pkg_dir = None
try:
_name, _requirements, _url = self.parse_pkg_uri(name, requirements)
@@ -251,8 +252,13 @@ class LibraryManager(BasePkgManager):
silent=silent,
interactive=interactive)
requirements = _requirements
pkg_dir = BasePkgManager.install(self, name, requirements, silent,
trigger_event)
pkg_dir = BasePkgManager.install(
self,
name,
requirements,
silent=silent,
trigger_event=trigger_event,
force=force)
except exception.InternetIsOffline as e:
if not silent:
click.secho(str(e), fg="yellow")
@@ -271,7 +277,12 @@ class LibraryManager(BasePkgManager):
for filters in self.normalize_dependencies(manifest['dependencies']):
assert "name" in filters
if any([s in filters.get("version", "") for s in ("\\", "/")]):
self.install("{name}={version}".format(**filters))
self.install(
"{name}={version}".format(**filters),
silent=silent,
trigger_event=trigger_event,
interactive=interactive,
force=force)
else:
try:
lib_info = self.search_for_library(filters, silent,
@@ -284,14 +295,18 @@ class LibraryManager(BasePkgManager):
if filters.get("version"):
self.install(
lib_info['id'],
requirements=filters.get("version"),
filters.get("version"),
silent=silent,
trigger_event=trigger_event)
trigger_event=trigger_event,
interactive=interactive,
force=force)
else:
self.install(
lib_info['id'],
silent=silent,
trigger_event=trigger_event)
trigger_event=trigger_event,
interactive=interactive,
force=force)
return pkg_dir
@staticmethod
+6 -1
View File
@@ -602,7 +602,8 @@ class BasePkgManager(PkgRepoMixin, PkgInstallerMixin):
name,
requirements=None,
silent=False,
trigger_event=True):
trigger_event=True,
force=False):
name, requirements, url = self.parse_pkg_uri(name, requirements)
package_dir = self.get_package_dir(name, requirements, url)
@@ -614,6 +615,10 @@ class BasePkgManager(PkgRepoMixin, PkgInstallerMixin):
return package_dir
self.INSTALL_HISTORY.append(history_key)
if package_dir and force:
self.uninstall(package_dir)
package_dir = None
if not package_dir or not silent:
msg = "Installing " + click.style(name, fg="cyan")
if requirements:
+14 -9
View File
@@ -63,9 +63,10 @@ class PlatformManager(BasePkgManager):
skip_default_package=False,
trigger_event=True,
silent=False,
force=False,
**_): # pylint: disable=too-many-arguments, arguments-differ
platform_dir = BasePkgManager.install(
self, name, requirements, silent=silent)
self, name, requirements, silent=silent, force=force)
p = PlatformFactory.newPlatform(platform_dir)
# @Hook: when 'update' operation (trigger_event is False),
@@ -76,7 +77,8 @@ class PlatformManager(BasePkgManager):
with_packages,
without_packages,
skip_default_package,
silent=silent)
silent=silent,
force=force)
self.cleanup_packages(p.packages.keys())
return True
@@ -248,11 +250,13 @@ class PlatformFactory(object):
class PlatformPackagesMixin(object):
def install_packages(self,
with_packages=None,
without_packages=None,
skip_default_package=False,
silent=False):
def install_packages( # pylint: disable=too-many-arguments
self,
with_packages=None,
without_packages=None,
skip_default_package=False,
silent=False,
force=False):
with_packages = set(self.find_pkg_names(with_packages or []))
without_packages = set(self.find_pkg_names(without_packages or []))
@@ -268,9 +272,10 @@ class PlatformPackagesMixin(object):
elif (name in with_packages or
not (skip_default_package or opts.get("optional", False))):
if ":" in version:
self.pm.install("%s=%s" % (name, version), silent=silent)
self.pm.install(
"%s=%s" % (name, version), silent=silent, force=force)
else:
self.pm.install(name, version, silent=silent)
self.pm.install(name, version, silent=silent, force=force)
return True