diff --git a/pisi/operations.py b/pisi/operations.py index e4c52269..394328c1 100644 --- a/pisi/operations.py +++ b/pisi/operations.py @@ -103,12 +103,12 @@ 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: - ctx.ui.info(_("""The following minimal list of packages will be installed -in the respective order to satisfy dependencies: -""") + util.strlist(order)) + ctx.ui.info(_("""The following packages will be installed +in the respective order to satisfy extra dependencies: +""") + util.strlist(extra_packages)) if not ctx.ui.confirm(_('Do you want to continue?')): raise Error(_('External dependencies not satisfied')) - install_packages(extra_packages) + install_pkg_names(extra_packages) class PackageDB: def __init__(self): self.d = d_t diff --git a/tests/beta-light.sh b/tests/beta-light.sh index 7eb2518b..a5cff0a2 100755 --- a/tests/beta-light.sh +++ b/tests/beta-light.sh @@ -1,4 +1,4 @@ -bi#!/bin/sh +#!/bin/sh pwd PATH=$PATH:. @@ -14,10 +14,10 @@ pisi-cli -Dtmp -d add-repo repo1 pisi-index.xml pisi-cli -Dtmp list-repo pisi-cli -Dtmp update-repo repo1 pisi-cli -Dtmp list-available -pisi-cli -Dtmp --ignore-comar install zip +pisi-cli -Dtmp --ignore-comar -y install zip pisi-cli -Dtmp list-installed -pisi-cli -Dtmp --ignore-comar remove unzip +pisi-cli -Dtmp --ignore-comar -y remove unzip pisi-cli -Dtmp info zip*.pisi -pisi-cli -d -Dtmp --ignore-comar install zip*.pisi +pisi-cli -d -Dtmp --ignore-comar -y install zip*.pisi pisi-cli -Dtmp list-pending pisi-cli -Dtmp configure-pending