diff --git a/pisi-install b/pisi-install index fcc9bed7..ef79c765 100755 --- a/pisi-install +++ b/pisi-install @@ -45,6 +45,7 @@ def main(): print '*** An installation error has occured:' print ' ', estr sys.exit(1) + ui.info("Package(s) installed successfully as intended.\n") if __name__ == "__main__": main() diff --git a/pisi/archive.py b/pisi/archive.py index 1e152f8a..5f93f59c 100644 --- a/pisi/archive.py +++ b/pisi/archive.py @@ -123,15 +123,12 @@ class ArchiveZip(ArchiveBase): else: # change archiveRoot if util.subpath(archiveRoot, info.filename): - print '!', archiveRoot, info.filename outpath = util.removepathprefix(archiveRoot, info.filename) - print '*', outpath else: continue # don't extract if not under ofile = os.path.join(targetDir, outpath) - print 'ofile ', ofile if isdir: # a directory is present. continue # FIXME: do nothing! diff --git a/pisi/dependency.py b/pisi/dependency.py index fb801df8..0559eb8d 100644 --- a/pisi/dependency.py +++ b/pisi/dependency.py @@ -24,7 +24,7 @@ def installDeps(pkg): def satisfiesInstallDeps(pkg): deps = installDeps(pkg) - print 'installdeps = ', deps +# print 'installdeps = ', deps return reduce(lambda x,y:x and y, map(lambda x: satisfiesDep(pkg, x), deps),True) @@ -33,7 +33,7 @@ def runtimeDeps(pkg): def satisfiesRuntimeDeps(pkg): deps = runtimeDeps(pkg) - print 'runtimedeps = ', deps +# print 'runtimedeps = ', deps return reduce(lambda x,y:x and y, map(lambda x: satisfiesDep(pkg, x), deps),True) @@ -43,9 +43,9 @@ def installable(pkg): if not packagedb.has_package(pkg): ui.info("package " + pkg + " is not present in the package database\n"); return False - elif not satisfiesRuntimeDeps(pkg) and satisfiesInstallDeps(pkg): + elif satisfiesRuntimeDeps(pkg) and satisfiesInstallDeps(pkg): + return True + else: ui.info("package " + pkg + " does not satisfy dependencies\n"); return False - else: - return True