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