moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-07 20:08:03 -05:00
Code Issues Releases Wiki Activity

Check empty subdirectory ownership

Browse Source 
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>
This commit is contained in:
Allan McRae 2012-07-08 23:58:37 +10:00 committed by Dan McGee
parent 717fdb8ee0
commit 44e9fdd0e8
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libalpm/conflict.c
View File

@ -339,6 +339,11 @@ static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath,
struct dirent *ent = NULL; struct dirent *ent = NULL;
const char *root = handle->root; 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 /* 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 * 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 * is not simple as even if the directory is being unowned by a conflicting

17
test/pacman/tests/fileconflict012.py Normal file
View File

@ -0,0 +1,17 @@
self.description = "dir->file change during package upgrade (filesystem file conflict)"
lp1 = pmpkg("pkg1")
lp1.files = ["dir/"]
self.addpkg2db("local", lp1)
self.filesystem = ["dir/file"]
p = pmpkg("pkg1", "1.0-2")
p.files = ["dir"]
self.addpkg2db("sync", p)
self.args = "-S pkg1"
self.addrule("PACMAN_RETCODE=1")
self.addrule("PKG_VERSION=pkg1|1.0-1")
self.addrule("DIR_EXIST=dir/")