diff options
| author | Allan McRae <allan@archlinux.org> | 2012-07-08 23:58:37 +1000 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-07-10 08:31:48 -0500 |
| commit | 44e9fdd0e848382337edb97d41e7317638a67bac (patch) | |
| tree | cfe064ec834c3d03cbe2a5f39b61f42231a480f6 /lib | |
| parent | 717fdb8ee0fd23cf72fc7d2832317f513caefa2c (diff) | |
Check empty subdirectory ownership
When checking if a package owns a directory, it is important to check
not only that all the files in the directory are part of the package,
but also if the directory is part of a package. This catches empty
subdirectories during conflict checking for directory to file/symlink
replacements.
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libalpm/conflict.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index efa1a87c..d6e5d8c6 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -339,6 +339,11 @@ static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath, struct dirent *ent = NULL; const char *root = handle->root; + /* check directory is actually in package - used for subdirectory checks */ + if(!_alpm_filelist_contains(alpm_pkg_get_files(pkg), dirpath)) { + return 0; + } + /* TODO: this is an overly strict check but currently pacman will not * overwrite a directory with a file (case 10/11 in add.c). Adjusting that * is not simple as even if the directory is being unowned by a conflicting |