From 5504639ceb5a72b82f641d11de33de0d5667e71d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= Date: Sat, 27 Feb 2010 19:29:09 +0000 Subject: [PATCH] Install files into correct paths when the old package format is used. This was a regression introduced when switching to python 2.6. --- ChangeLog | 5 +++++ pisi/archive.py | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bbd4a231..ad1830b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-02-27 Fatih Aşıcı + * pisi/archive.py: Install files into correct paths when the old + package format is used. This was a regression introduced when + switching to python 2.6. + 2010-02-22 Fatih Aşıcı * pisi/cli/addrepo.py, pisi/db/repodb.py: Remove the check for repository architecture as the current infrastructure diff --git a/pisi/archive.py b/pisi/archive.py index 9f7cc234..fdcad67e 100644 --- a/pisi/archive.py +++ b/pisi/archive.py @@ -471,7 +471,8 @@ class ArchiveZip(ArchiveBase): if sys.version_info[:2] < (2, 6): zip_obj.decompressToFile(info.filename, ofile) else: - zip_obj.extract(info.filename, target_dir) + info.filename = outpath + zip_obj.extract(info, target_dir) os.chmod(ofile, perm) def unpack_files(self, paths, target_dir):