From b630c8ed200ee115d3e619dd492bc1e0789f20d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eray=20=C3=96zkural?= Date: Thu, 23 Jun 2005 13:55:19 +0000 Subject: [PATCH] * ufak tefek fixler --- pisi/install.py | 3 ++- pisi/metadata.py | 2 +- pisi/package.py | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pisi/install.py b/pisi/install.py index c09ad567..bc2b324a 100644 --- a/pisi/install.py +++ b/pisi/install.py @@ -9,6 +9,7 @@ from ui import ui import installdb import packagedb import dependency +from metadata import MetaData #import conflicts ##TODO: Caglar'in onerisi uzerine. @@ -41,7 +42,7 @@ def install(package_fn): # check conflicts # check dependencies - if not dependency.installable(metadata.packages[0].name): + if not dependency.installable(metadata.package.name): raise InstallError("Package not installable") # unzip package in place diff --git a/pisi/metadata.py b/pisi/metadata.py index 6c5271fb..d28fd675 100644 --- a/pisi/metadata.py +++ b/pisi/metadata.py @@ -46,5 +46,5 @@ class MetaData(XmlFile): document.appendChild(elt) self.writexml(filename) - def verify(): + def verify(self): return True diff --git a/pisi/package.py b/pisi/package.py index 1c0ebd5f..ecd189c6 100644 --- a/pisi/package.py +++ b/pisi/package.py @@ -5,6 +5,7 @@ import archive from constants import const from config import config +from metadata import MetaData class Package: """Package: PISI package class""" @@ -25,18 +26,18 @@ class Package: def extract_files(self, paths, outdir): """extract file with path to outdir""" - impl.unpack_files(paths, outdir) + self.impl.unpack_files(paths, outdir) def extract_dir(self, dir, outdir): """extract directory recursively, this function copies the directory archiveroot/dir to outdir""" - impl.unpack_dir(path, outdir) + self.impl.unpack_dir(path, outdir) def extract_dir_flat(self, dir, outdir): """extract directory recursively, this function unpacks the *contents* of directory archiveroot/dir inside outdir this is the function used by the installer""" - impl.unpack_dir_flat(dir, outdir) + self.impl.unpack_dir_flat(dir, outdir) def extract_PISI_files(self, outdir): """extract PISI control files: metadata.xml, files.xml,