diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index 37072251..9a0ea566 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -186,7 +186,6 @@ class PackageOp(Command): except pisi.comariface.ComarError: ui.error('Comar error encountered\n') self.die() - self.finalize() def finalize(self): #self.finalize_db() diff --git a/pisi/dependency.py b/pisi/dependency.py index af8f9552..57e91e52 100644 --- a/pisi/dependency.py +++ b/pisi/dependency.py @@ -122,7 +122,7 @@ def installable(pkg): """calculate if pkg is installable currently which means it has to satisfy both install and runtime dependencies""" if not packagedb.has_package(pkg): - ui.info("package " + pkg + " is not present in the package database\n"); + ui.info("Package " + pkg + " is not present in the package database\n"); return False elif satisfiesRuntimeDeps(pkg): return True diff --git a/pisi/toplevel.py b/pisi/toplevel.py index d5aa9cf5..2856752d 100644 --- a/pisi/toplevel.py +++ b/pisi/toplevel.py @@ -60,9 +60,11 @@ def install_pkg_files(packages): """install a number of pisi package files""" from package import Package + ui.debug('A = %s\n' % str(packages)) + for x in packages: if not x.endswith(const.package_prefix): - ui.error('Mixing file names and package names not supported\n') + ui.error('Mixing file names and package names not supported YET.\n') return False # read the package information into memory first @@ -95,6 +97,8 @@ def install_pkg_files(packages): extra_packages = [x.package for x in dep_unsatis] if (extra_packages and install_pkg_names(extra_packages)) or \ (not extra_packages): + #FIXME: Construct a dependency graph for files + # and install in rev. topological order for x in packages: operations.install_single_file(x) @@ -105,6 +109,8 @@ def install_pkg_names(A): the repository, trying to perform a minimum number of installs""" + ui.debug('A = %s\n' % str(A)) + if len(A)==0: ui.info('No packages to install.\n') return True