* find what's missing

This commit is contained in:
Eray Özkural
2005-08-13 03:22:31 +00:00
parent ab11caa4aa
commit 3518b7fd03
3 changed files with 8 additions and 3 deletions
-1
View File
@@ -186,7 +186,6 @@ class PackageOp(Command):
except pisi.comariface.ComarError: except pisi.comariface.ComarError:
ui.error('Comar error encountered\n') ui.error('Comar error encountered\n')
self.die() self.die()
self.finalize()
def finalize(self): def finalize(self):
#self.finalize_db() #self.finalize_db()
+1 -1
View File
@@ -122,7 +122,7 @@ def installable(pkg):
"""calculate if pkg is installable currently """calculate if pkg is installable currently
which means it has to satisfy both install and runtime dependencies""" which means it has to satisfy both install and runtime dependencies"""
if not packagedb.has_package(pkg): 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 return False
elif satisfiesRuntimeDeps(pkg): elif satisfiesRuntimeDeps(pkg):
return True return True
+7 -1
View File
@@ -60,9 +60,11 @@ def install_pkg_files(packages):
"""install a number of pisi package files""" """install a number of pisi package files"""
from package import Package from package import Package
ui.debug('A = %s\n' % str(packages))
for x in packages: for x in packages:
if not x.endswith(const.package_prefix): 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 return False
# read the package information into memory first # 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] extra_packages = [x.package for x in dep_unsatis]
if (extra_packages and install_pkg_names(extra_packages)) or \ if (extra_packages and install_pkg_names(extra_packages)) or \
(not extra_packages): (not extra_packages):
#FIXME: Construct a dependency graph for files
# and install in rev. topological order
for x in packages: for x in packages:
operations.install_single_file(x) operations.install_single_file(x)
@@ -105,6 +109,8 @@ def install_pkg_names(A):
the repository, trying to perform a minimum number of the repository, trying to perform a minimum number of
installs""" installs"""
ui.debug('A = %s\n' % str(A))
if len(A)==0: if len(A)==0:
ui.info('No packages to install.\n') ui.info('No packages to install.\n')
return True return True