From d9c917e9cf4a357d581e8bf2cb41fc8521b627d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eray=20=C3=96zkural?= Date: Mon, 18 Jul 2005 12:34:55 +0000 Subject: [PATCH] * tamir: degisen install yuzunden kirilan info komutunu duzelt, gereken operations.info yu implement et * geri kalan bir iki ufak hatayi duzelt, simdi build/install'lar calisiyor gene ... Building package sharutils Generating metadata.xml... done. Generating files.xml... done. Creating PISI package sharutils-4.2.1-10.pisi nebula:pisi$ pisi-cli install sharutils-4.2.1-10.pisi Extracting files Storing files.xml Storing metadata.xml --- pisi/cli/commands.py | 2 +- pisi/install.py | 3 +++ pisi/operations.py | 7 +++++++ pisi/package.py | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index 53cdae85..31c102a4 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -154,7 +154,7 @@ class Info(Command): def printinfo(self, arg): import os.path if os.path.exists(arg): - metadata, files = pisi.install.get_pkg_info(arg) + metadata, files = pisi.operations.info(arg) print metadata.package class Index(Command): diff --git a/pisi/install.py b/pisi/install.py index 2dff3255..1cbcb3fa 100644 --- a/pisi/install.py +++ b/pisi/install.py @@ -80,6 +80,9 @@ class Installer: # check dependencies if not dependency.installable(pkginfo.name): + ui.error('Dependencies for ' + pkginfo.name + + ' not satisfied\n') + raise InstallError("Package not installable") #TODO: diff --git a/pisi/operations.py b/pisi/operations.py index a8d5961a..c0110f5a 100644 --- a/pisi/operations.py +++ b/pisi/operations.py @@ -1,3 +1,5 @@ +from package import Package + # all package operation interfaces are here def remove(package_name): @@ -16,4 +18,9 @@ from install import Installer def install(package_name): i = Installer(package_name), i.install() +def info(package_name): + package = Package(package_name) + package.read() + return package.metadata, package.files + diff --git a/pisi/package.py b/pisi/package.py index 1256aa66..e2d26da6 100644 --- a/pisi/package.py +++ b/pisi/package.py @@ -69,7 +69,7 @@ class Package: self.extract_files([const.metadata_xml, const.files_xml], outdir) self.extract_dir('config', outdir) - def read_info(self, outdir = None): + def read(self, outdir = None): if not outdir: outdir = config.tmp_dir()