From d34d845431925d671e32e4741f35398ded9f26d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ozan=20=C3=87a=C4=9Flayan?= Date: Tue, 4 Aug 2009 13:42:05 +0000 Subject: [PATCH] =?UTF-8?q?2009-08-04=20Ozan=20=C3=87a=C4=9Flayan=20=20=20=20=20=20=20=20=20=20=20=20=20=20*=20(opera?= =?UTF-8?q?tions/build.py):=20Really=20fix=20the=20abandoned=20file=20chec?= =?UTF-8?q?king=20when=20=20=20=20=20=20=20=20=20=20=20=20=20the=20path=20?= =?UTF-8?q?in=20pspec.xml=20and=20the=20actual=20path=20of=20a=20missed=20?= =?UTF-8?q?file=20intersects.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChangeLog | 4 ++++ pisi/operations/build.py | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 85391406..6c238121 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-08-04 Ozan Çağlayan + * (operations/build.py): Really fix the abandoned file checking when + the path in pspec.xml and the actual path of a missed file intersects. + 2009-08-03 Fatih Aşıcı * Make it possible to specify doc directory's name via destDir parameter provided to pisitools.dodoc. diff --git a/pisi/operations/build.py b/pisi/operations/build.py index ca3704b6..9ce8f3ca 100644 --- a/pisi/operations/build.py +++ b/pisi/operations/build.py @@ -426,12 +426,14 @@ class Builder: for root, dirs, files in os.walk(install_dir): for file_ in files: already_in_package = False - fpath = pisi.util.join_path(root, file_) + '/' - for path in all_paths_in_packages: - if not fpath.find(path): + fpath = pisi.util.join_path(root, file_) + for _path in all_paths_in_packages: + if os.path.isdir(_path) and not _path.endswith("/"): + _path = _path + "/" + if not fpath.find(_path): already_in_package = True if not already_in_package: - abandoned_files.append(fpath.rsplit("/", 1)[0]) + abandoned_files.append(fpath) return abandoned_files