From bfc3127a9d79664f17b8ae3948a2351bdef905bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Sat, 16 Jul 2005 21:17:26 +0000 Subject: [PATCH] =?UTF-8?q?files.xml=20ve=20metadata.xml=20tek=20bir=20dos?= =?UTF-8?q?ya=20bu=20y=C3=BCzden=20ayr=C4=B1=20dizine=20ihtiya=C3=A7lar?= =?UTF-8?q?=C4=B1=20yok.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pisi/context.py | 6 ------ pisi/install.py | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pisi/context.py b/pisi/context.py index d6611955..a9072ce0 100644 --- a/pisi/context.py +++ b/pisi/context.py @@ -99,12 +99,6 @@ class InstallContext(object): return self.lib_dir() + '/' + packageDir - def files_dir(self): - return self.pkg_dir() + const.files_dir_suffix - - def metadata_dir(self): - return self.pkg_dir() + const.metadata_dir_suffix - def comar_dir(self): return self.pkg_dir() + const.comar_dir_suffix diff --git a/pisi/install.py b/pisi/install.py index 5a636ef2..08eb818d 100644 --- a/pisi/install.py +++ b/pisi/install.py @@ -51,10 +51,10 @@ class PisiInstall: # somewhere in the file system. We'll need these in future... ui.info('Storing %s\n' % const.files_xml) - self.package.extract_file(const.files_xml, self.ctx.files_dir()) + self.package.extract_file(const.files_xml, self.ctx.pkg_dir()) ui.info('Storing %s\n' % const.metadata_xml) - self.package.extract_file(const.metadata_xml, self.ctx.metadata_dir()) + self.package.extract_file(const.metadata_xml, self.ctx.pkg_dir()) for pcomar in self.metadata.package.providesComar: fpath = os.path.join(const.comar_dir, pcomar.script) @@ -140,4 +140,4 @@ class PisiInstall: installdb.install(self.metadata.package.name, self.metadata.package.version, self.metadata.package.release, - os.path.join(self.ctx.files_dir(), 'files.xml')) + os.path.join(self.ctx.pkg_dir(), 'files.xml'))