From 98226d048bfe896d819a99e89b1ef23b78c14ec3 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Tue, 23 May 2006 07:00:50 +0000 Subject: [PATCH] out_dir for extract_install() --- pisi/atomicoperations.py | 2 +- pisi/package.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pisi/atomicoperations.py b/pisi/atomicoperations.py index 5728db30..f497c7d6 100644 --- a/pisi/atomicoperations.py +++ b/pisi/atomicoperations.py @@ -270,7 +270,7 @@ class Install(AtomicOperation): if path in leftover or old_fileinfo[path].type == ctx.const.conf: Remove.remove_file( old_fileinfo[path] ) - self.package.extract_install() + self.package.extract_install(ctx.config.dest_dir()) def store_pisi_files(self): """put files.xml, metadata.xml, actions.py and COMAR scripts diff --git a/pisi/package.py b/pisi/package.py index be48fd65..61371813 100644 --- a/pisi/package.py +++ b/pisi/package.py @@ -117,10 +117,10 @@ class Package: copies the directory archiveroot/dir to outdir""" self.impl.unpack_dir(dir, outdir) - def extract_install(self): + def extract_install(self, outdir): self.extract_file('install.tar.7z', ctx.config.tmp_dir()) tar = archive.ArchiveTar(join(ctx.config.tmp_dir(), 'install.tar.7z'), 'tar7z') - tar.unpack(ctx.config.dest_dir()) + tar.unpack(outdir) def extract_dir_flat(self, dir, outdir): """Extract directory recursively, this function