* fix: take into account that install_pkg_names doesn't have a return
value
This commit is contained in:
+8
-6
@@ -102,9 +102,13 @@ def install_pkg_files(package_URIs):
|
||||
|
||||
# if so, then invoke install_pkg_names
|
||||
extra_packages = [x.package for x in dep_unsatis]
|
||||
if (extra_packages and install_pkg_names(extra_packages)) or \
|
||||
(not extra_packages):
|
||||
|
||||
if extra_packages:
|
||||
ctx.ui.info(_("""The following minimal list of packages will be installed
|
||||
in the respective order to satisfy dependencies:
|
||||
""") + util.strlist(order))
|
||||
if not ctx.ui.confirm(_('Do you want to continue?')):
|
||||
raise Error(_('External dependencies not satisfied'))
|
||||
install_packages(extra_packages)
|
||||
class PackageDB:
|
||||
def __init__(self):
|
||||
self.d = d_t
|
||||
@@ -151,8 +155,6 @@ def install_pkg_files(package_URIs):
|
||||
ctx.ui.info(_('Installation order: ') + util.strlist(order) )
|
||||
for x in order:
|
||||
atomicoperations.install_single_file(dfn[x])
|
||||
else:
|
||||
raise Error(_('External dependencies not satisfied'))
|
||||
|
||||
return True # everything went OK.
|
||||
|
||||
@@ -230,7 +232,7 @@ def install_pkg_names(A):
|
||||
in the respective order to satisfy dependencies:
|
||||
""") + util.strlist(order))
|
||||
if len(order) > len(A_0):
|
||||
if not ctx.ui.confirm('Do you want to continue?'):
|
||||
if not ctx.ui.confirm(_('Do you want to continue?')):
|
||||
return False
|
||||
for x in order:
|
||||
atomicoperations.install_single_name(x)
|
||||
|
||||
Reference in New Issue
Block a user