diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index 7cfb52e4..53cdae85 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -109,9 +109,9 @@ class Install(Command): self.help() return - from pisi.cli import installhelper + from pisi.install import Installer for arg in self.args: - url = PUrl(packagefile) + url = PUrl(arg) if url.isRemoteFile(): pass # bunu simdilik bosverelim, once bir calissin :) diff --git a/pisi/install.py b/pisi/install.py index fee55d89..2dff3255 100644 --- a/pisi/install.py +++ b/pisi/install.py @@ -25,7 +25,7 @@ class Installer: "Installer class, provides install routines for pisi packages" def __init__(self, package_fname): self.package = Package(package_fname) - self.package.read() + self.package.read_info() self.metadata = self.package.metadata self.files = self.package.files diff --git a/pisi/package.py b/pisi/package.py index 113c8aea..1256aa66 100644 --- a/pisi/package.py +++ b/pisi/package.py @@ -74,15 +74,15 @@ class Package: outdir = config.tmp_dir() # extract control files - self.package.extract_PISI_files(tmpdir) + self.extract_PISI_files(outdir) self.metadata = MetaData() - self.metadata.read( join(tmpdir, config.metadata_xml) ) - if not metadata.verify(): + self.metadata.read( join(outdir, const.metadata_xml) ) + if not self.metadata.verify(): raise PackageError("MetaData format wrong") self.files = Files() - self.files.read( join(tmpdir, const.files_xml) ) + self.files.read( join(outdir, const.files_xml) ) def pkg_dir(self): packageDir = self.metadata.package.name + '-' \