Signed-off-by: Andrew Gregory andrew.gregory.8@gmail.com --- test/pacman/tests/fileconflict007.py | 1 + test/pacman/tests/fileconflict013.py | 7 +++++-- test/pacman/tests/fileconflict022.py | 1 - test/pacman/tests/fileconflict023.py | 9 ++++++--- test/pacman/tests/fileconflict025.py | 10 ++++++---- test/pacman/tests/symlink001.py | 11 ++++++----- test/pacman/tests/sync700.py | 12 ++++++------ test/pacman/tests/sync701.py | 11 +++++------ test/pacman/tests/sync702.py | 9 +++++---- 9 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/test/pacman/tests/fileconflict007.py b/test/pacman/tests/fileconflict007.py index 4ee4624..7fe65ed 100644 --- a/test/pacman/tests/fileconflict007.py +++ b/test/pacman/tests/fileconflict007.py @@ -1,17 +1,18 @@ self.description = "Fileconflict with symlinks (klibc case)"

lp = pmpkg("pkg") lp.files = ["dir/realdir/", "dir/symdir -> realdir", "dir/realdir/file"] self.addpkg2db("local", lp)

p = pmpkg("pkg", "1.0-2") p.files = ["dir/symdir/file"] self.addpkg(p)

self.args = "-U %s" % p.filename()

self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_EXIST=pkg") self.addrule("PKG_VERSION=pkg|1.0-2") +self.addrule("FILE_TYPE=dir/symdir/|dir") diff --git a/test/pacman/tests/fileconflict013.py b/test/pacman/tests/fileconflict013.py index a83923c..5c3a43b 100644 --- a/test/pacman/tests/fileconflict013.py +++ b/test/pacman/tests/fileconflict013.py @@ -1,20 +1,23 @@ self.description = "file->file path change with same effective path (/lib as symlink)" +# Note: this situation means the filesystem and local db are out of sync

lp1 = pmpkg("filesystem", "1.0-1") lp1.files = ["usr/", "usr/lib/", "lib -> usr/lib/"] self.addpkg2db("local", lp1)

lp2 = pmpkg("pkg1", "1.0-1") lp2.files = ["lib/libfoo.so"] self.addpkg2db("local", lp2)

sp1 = pmpkg("pkg1", "1.0-2") sp1.files = ["usr/lib/libfoo.so"] self.addpkg2db("sync", sp1)

self.args = "-Su"

-self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_VERSION=pkg1|1.0-2") +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_VERSION=pkg1|1.0-1") + +self.expectfailure = True diff --git a/test/pacman/tests/fileconflict022.py b/test/pacman/tests/fileconflict022.py index 5759d4c..5ff0b53 100644 --- a/test/pacman/tests/fileconflict022.py +++ b/test/pacman/tests/fileconflict022.py @@ -1,19 +1,18 @@ self.description = "File conflict between package with symlink and package with real path"

self.filesystem = ["usr/lib/", "lib -> usr/lib/"]

sp1 = pmpkg("foo") # share/ causes the entries to be reordered after path resolution sp1.files = ["lib/", "lib/file", "share/"] self.addpkg2db("sync", sp1)

sp2 = pmpkg("bar") sp2.files = ["usr/", "usr/lib/", "usr/lib/file"] self.addpkg2db("sync", sp2)

self.args = "-S %s %s" % (sp1.name, sp2.name)

self.addrule("PACMAN_RETCODE=1") -self.addrule("PACMAN_OUTPUT=.*/usr/lib/file exists in both 'foo' and 'bar'") self.addrule("!PKG_EXIST=foo") self.addrule("!PKG_EXIST=bar") diff --git a/test/pacman/tests/fileconflict023.py b/test/pacman/tests/fileconflict023.py index ce72087..9685c0d 100644 --- a/test/pacman/tests/fileconflict023.py +++ b/test/pacman/tests/fileconflict023.py @@ -1,18 +1,21 @@ self.description = "File conflict between package with symlink and package with real path resolved by removal" +# Note: this situation means the filesystem and local db are out of sync

self.filesystem = ["usr/", "usr/lib/", "lib -> usr/lib/"]

lp1 = pmpkg("foo") lp1.files = ["lib/", "lib/file"] self.addpkg2db("local", lp1)

sp1 = pmpkg("bar") sp1.conflicts = ["foo"] sp1.files = ["usr/", "usr/lib/", "usr/lib/file"] self.addpkg2db("sync", sp1)

self.args = "-S %s --ask=4" % sp1.name

-self.addrule("PACMAN_RETCODE=0") -self.addrule("!PKG_EXIST=foo") -self.addrule("PKG_EXIST=bar") +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_EXIST=foo") +self.addrule("!PKG_EXIST=bar") + +self.expectfailure = True diff --git a/test/pacman/tests/fileconflict025.py b/test/pacman/tests/fileconflict025.py index 3c6f063..195badb 100644 --- a/test/pacman/tests/fileconflict025.py +++ b/test/pacman/tests/fileconflict025.py @@ -1,18 +1,20 @@ -self.description = "File conflict between package with symlink and package with real path resolved by removal (reversed)" +self.description = "File conflict between package with symlink and package with real path and filesystem (reversed)"

self.filesystem = ["usr/lib/", "lib -> usr/lib/"]

lp1 = pmpkg("foo") lp1.files = ["usr/", "usr/lib/", "usr/lib/file"] self.addpkg2db("local", lp1)

sp1 = pmpkg("bar") sp1.conflicts = ["foo"] sp1.files = ["lib/", "lib/file"] self.addpkg2db("sync", sp1)

self.args = "-S %s --ask=4" % sp1.name

-self.addrule("PACMAN_RETCODE=0") -self.addrule("!PKG_EXIST=foo") -self.addrule("PKG_EXIST=bar") +self.addrule("PACMAN_RETCODE=1") +self.addrule("PKG_EXIST=foo") +self.addrule("!PKG_EXIST=bar") + +self.expectfailure = True diff --git a/test/pacman/tests/symlink001.py b/test/pacman/tests/symlink001.py index cbf71cc..f88d0ae 100644 --- a/test/pacman/tests/symlink001.py +++ b/test/pacman/tests/symlink001.py @@ -1,20 +1,21 @@ self.description = "Dir symlinks overwritten on install (the perl/git bug)"

lp = pmpkg("dummy") lp.files = ["dir/realdir/", "dir/symdir -> realdir"] self.addpkg2db("local", lp)

p = pmpkg("pkg1") p.files = ["dir/symdir/tmp"] self.addpkg(p)

self.args = "-U %s" % p.filename()

-self.addrule("PACMAN_RETCODE=0") -self.addrule("PKG_EXIST=pkg1") -self.addrule("FILE_EXIST=dir/symdir/tmp") -self.addrule("FILE_EXIST=dir/realdir/tmp") -self.addrule("FILE_TYPE=dir/symdir/tmp|file") +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("!FILE_EXIST=dir/symdir/tmp") +self.addrule("!FILE_EXIST=dir/realdir/tmp") self.addrule("FILE_TYPE=dir/symdir|link") self.addrule("FILE_TYPE=dir/realdir|dir") + +self.expectfailure = True diff --git a/test/pacman/tests/sync700.py b/test/pacman/tests/sync700.py index 9748c81..3948b00 100644 --- a/test/pacman/tests/sync700.py +++ b/test/pacman/tests/sync700.py @@ -1,22 +1,22 @@ -self.description = "do not remove directory symlink if another package has file in its path" +self.description = "removal of directory symlink when another package has file in its path" +# Note: this situation means that the filesystem and local db are out of sync

lp1 = pmpkg("pkg1") lp1.files = ["usr/lib/foo", "lib -> usr/lib"] self.addpkg2db("local", lp1)

lp2 = pmpkg("pkg2") lp2.files = ["lib/bar"] self.addpkg2db("local", lp2)

p = pmpkg("pkg1", "1.0-2") p.files = ["usr/lib/foo"] self.addpkg2db("sync", p)

self.args = "-S pkg1"

-self.addrule("PACMAN_RETCODE=1") -self.addrule("PKG_VERSION=pkg1|1.0-1") -self.addrule("FILE_EXIST=lib/bar") - -self.expectfailure = True +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=pkg1|1.0-2") +self.addrule("FILE_EXIST=usr/lib/bar") +self.addrule("!FILE_EXIST=lib/bar") diff --git a/test/pacman/tests/sync701.py b/test/pacman/tests/sync701.py index 201f602..590845f 100644 --- a/test/pacman/tests/sync701.py +++ b/test/pacman/tests/sync701.py @@ -1,22 +1,21 @@ -self.description = "do not remove directory symlink if incoming package has file in its path (order 1)" +self.description = "incoming package replaces symlink with directory (order 1)"

lp = pmpkg("pkg1") lp.files = ["usr/lib/foo", "lib -> usr/lib"] self.addpkg2db("local", lp)

p1 = pmpkg("pkg1", "1.0-2") p1.files = ["usr/lib/foo"] self.addpkg2db("sync", p1)

p2 = pmpkg("pkg2") p2.files = ["lib/bar"] self.addpkg2db("sync", p2)

self.args = "-S pkg1 pkg2"

-self.addrule("PACMAN_RETCODE=1") -self.addrule("PKG_VERSION=pkg1|1.0-1") -self.addrule("!PKG_EXIST=pkg2") - -self.expectfailure = True +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=pkg1|1.0-2") +self.addrule("PKG_EXIST=pkg2") +self.addrule("FILE_TYPE=lib|dir") diff --git a/test/pacman/tests/sync702.py b/test/pacman/tests/sync702.py index ee4eef9..8f4c0ad 100644 --- a/test/pacman/tests/sync702.py +++ b/test/pacman/tests/sync702.py @@ -1,22 +1,23 @@ -self.description = "do not remove directory symlink if incoming package has file in its path (order 2)" +self.description = "incoming package replaces symlink with directory (order 2)"

lp = pmpkg("pkg2") lp.files = ["usr/lib/foo", "lib -> usr/lib"] self.addpkg2db("local", lp)

p1 = pmpkg("pkg1") p1.files = ["lib/bar"] self.addpkg2db("sync", p1)

p2 = pmpkg("pkg2", "1.0-2") p2.files = ["usr/lib/foo"] self.addpkg2db("sync", p2)

self.args = "-S pkg1 pkg2"

-self.addrule("PACMAN_RETCODE=1") -self.addrule("PKG_VERSION=pkg2|1.0-1") -self.addrule("!PKG_EXIST=pkg1") +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=pkg2|1.0-2") +self.addrule("PKG_EXIST=pkg1") +self.addrule("FILE_TYPE=lib|dir")

self.expectfailure = True

Signed-off-by: Andrew Gregory andrew.gregory.8@gmail.com --- lib/libalpm/conflict.c | 7 ------- test/pacman/tests/fileconflict001.py | 2 -- test/pacman/tests/fileconflict007.py | 2 ++ test/pacman/tests/fileconflict016.py | 2 -- test/pacman/tests/fileconflict017.py | 2 -- test/pacman/tests/fileconflict022.py | 2 -- test/pacman/tests/symlink001.py | 2 -- test/pacman/tests/sync701.py | 2 ++ 8 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 5e2fa1e..518a2c6 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -514,17 +514,10 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, _alpm_log(handle, ALPM_LOG_DEBUG, "checking possible conflict: %s\n", path);

if(filestr[strlen(filestr) - 1] == '/') { - struct stat sbuf; if(S_ISDIR(lsbuf.st_mode)) { _alpm_log(handle, ALPM_LOG_DEBUG, "file is a directory, not a conflict\n"); continue; } - stat(path, &sbuf); - if(S_ISLNK(lsbuf.st_mode) && S_ISDIR(sbuf.st_mode)) { - _alpm_log(handle, ALPM_LOG_DEBUG, - "file is a symlink to a dir, hopefully not a conflict\n"); - continue; - } /* if we made it to here, we want all subsequent path comparisons to * not include the trailing slash. This allows things like file -> * directory replacements. */ diff --git a/test/pacman/tests/fileconflict001.py b/test/pacman/tests/fileconflict001.py index e1371f8..b1ad5e1 100644 --- a/test/pacman/tests/fileconflict001.py +++ b/test/pacman/tests/fileconflict001.py @@ -25,5 +25,3 @@ self.addrule("!PKG_EXIST=pkg2") self.addrule("FILE_EXIST=dir/realdir/realfile") self.addrule("!FILE_EXIST=dir/realdir/file") - -self.expectfailure = True diff --git a/test/pacman/tests/fileconflict007.py b/test/pacman/tests/fileconflict007.py index 7fe65ed..b61ddb4 100644 --- a/test/pacman/tests/fileconflict007.py +++ b/test/pacman/tests/fileconflict007.py @@ -16,3 +16,5 @@ self.addrule("PKG_EXIST=pkg") self.addrule("PKG_VERSION=pkg|1.0-2") self.addrule("FILE_TYPE=dir/symdir/|dir") + +self.expectfailure = True diff --git a/test/pacman/tests/fileconflict016.py b/test/pacman/tests/fileconflict016.py index dbcf708..86ddd72 100644 --- a/test/pacman/tests/fileconflict016.py +++ b/test/pacman/tests/fileconflict016.py @@ -22,5 +22,3 @@ self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") - -self.expectfailure = True diff --git a/test/pacman/tests/fileconflict017.py b/test/pacman/tests/fileconflict017.py index 4b91dc6..3855a93 100644 --- a/test/pacman/tests/fileconflict017.py +++ b/test/pacman/tests/fileconflict017.py @@ -24,5 +24,3 @@ self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=pkg1") self.addrule("!PKG_EXIST=pkg2") - -self.expectfailure = True diff --git a/test/pacman/tests/fileconflict022.py b/test/pacman/tests/fileconflict022.py index b3920df..5ff0b53 100644 --- a/test/pacman/tests/fileconflict022.py +++ b/test/pacman/tests/fileconflict022.py @@ -16,5 +16,3 @@ self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=foo") self.addrule("!PKG_EXIST=bar") - -self.expectfailure = True diff --git a/test/pacman/tests/symlink001.py b/test/pacman/tests/symlink001.py index f88d0ae..9136551 100644 --- a/test/pacman/tests/symlink001.py +++ b/test/pacman/tests/symlink001.py @@ -17,5 +17,3 @@ self.addrule("!FILE_EXIST=dir/realdir/tmp") self.addrule("FILE_TYPE=dir/symdir|link") self.addrule("FILE_TYPE=dir/realdir|dir") - -self.expectfailure = True diff --git a/test/pacman/tests/sync701.py b/test/pacman/tests/sync701.py index 590845f..912c794 100644 --- a/test/pacman/tests/sync701.py +++ b/test/pacman/tests/sync701.py @@ -19,3 +19,5 @@ self.addrule("PKG_VERSION=pkg1|1.0-2") self.addrule("PKG_EXIST=pkg2") self.addrule("FILE_TYPE=lib|dir") + +self.expectfailure = True

On 27/04/13 10:00, Andrew Gregory wrote:

In the event of a symlink<->dir transition, the paths for the incoming package need to be resolved to match the filelist for installed packages.

Can you explain this to me? Every time I think I understand, I don't...

e.g.

outdated local package: /usr/foo -> /usr/bar/ /usr/bar/baz

update sync package: /usr/foo/baz

So /usr/foo/baz is a new file so it is tested for presence in the filesystem. But /usr/foo/baz "exists" on the filesystem as /usr/bar/baz.

From what I understand, you resolve the package file "/usr/foo/baz" to

"/usr/bar/baz" and note that it is in the old package so not a conflict. Which feels wrong to me...

Can we do something like testing whether the directory of the "conflicting" file and the resolved path of that directory are different? If not, then we must be dealing with a case of a filesystem symlink being replaced with a package directory (otherwise the package directory would have conflicted with the filesystem symlink earlier).

Note: this only enables the symlink<->dir transition itself. Any installed packages with invalid file lists containing symlinks are not detected.

Signed-off-by: Andrew Gregory andrew.gregory.8@gmail.com

lib/libalpm/conflict.c | 42 ++++++++++++++++------------------- src/common/util-common.c | 43 ++++++++++++++++++++++++++++++++++++ src/common/util-common.h | 1 + test/pacman/tests/fileconflict007.py | 2 -- test/pacman/tests/sync701.py | 2 -- test/pacman/tests/sync702.py | 2 -- 6 files changed, 63 insertions(+), 29 deletions(-)

diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 518a2c6..08c1cbe 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -501,7 +501,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, /* have we acted on this conflict? */ int resolved_conflict = 0; struct stat lsbuf;

• 	char path[PATH_MAX];
  

• 	char path[PATH_MAX], resolved_path[PATH_MAX];
  size_t pathlen;
  
  pathlen = snprintf(path, PATH_MAX, "%s%s", handle->root, filestr);
  

@@ -513,7 +513,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,

	_alpm_log(handle, ALPM_LOG_DEBUG, "checking possible conflict: %s\n", path);

• 	if(filestr[strlen(filestr) - 1] == '/') {
  

• 	if(path[pathlen - 1] == '/') {
  	if(S_ISDIR(lsbuf.st_mode)) {
  		_alpm_log(handle, ALPM_LOG_DEBUG, "file is a directory, not a conflict\n");
  		continue;
  

@@ -524,7 +524,19 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, path[pathlen - 1] = '\0'; }

• 	relative_path = path + rootlen;
  

• 	if(lrealpath(path, resolved_path)
  

• 			&& strncmp(resolved_path, handle->root, rootlen) == 0) {
  

• 		relative_path = resolved_path + rootlen;
  

• 	} else {
  

• 		relative_path = path + rootlen;
  

• 	}
  

• 	if(!resolved_conflict && dbpkg
  

• 			&& alpm_filelist_contains(alpm_pkg_get_files(dbpkg), relative_path)) {
  

• 		_alpm_log(handle, ALPM_LOG_DEBUG,
  

• 				"package contained the resolved realpath\n");
  

• 		resolved_conflict = 1;
  

• 	}
  
  /* Check remove list (will we remove the conflicting local file?) */
  for(k = rem; k && !resolved_conflict; k = k->next) {
  

@@ -546,12 +558,12 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, alpm_pkg_t *localp2 = _alpm_db_get_pkgfromcache(handle->db_local, p2->name);

		/* localp2->files will be removed (target conflicts are handled by CHECK 1) */

• 		if(localp2 && alpm_filelist_contains(alpm_pkg_get_files(localp2), filestr)) {
  

• 		if(localp2 && alpm_filelist_contains(alpm_pkg_get_files(localp2), relative_path)) {
  		/* skip removal of file, but not add. this will prevent a second
  		 * package from removing the file when it was already installed
  		 * by its new owner (whether the file is in backup array or not */
  		handle->trans->skip_remove =
  

• 				alpm_list_add(handle->trans->skip_remove, strdup(filestr));
  

• 				alpm_list_add(handle->trans->skip_remove, strdup(relative_path));
  		_alpm_log(handle, ALPM_LOG_DEBUG,
  				"file changed packages, adding to remove skiplist\n");
  		resolved_conflict = 1;
  

@@ -560,8 +572,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,

	/* check if all files of the dir belong to the installed pkg */
	if(!resolved_conflict && S_ISDIR(lsbuf.st_mode) && dbpkg) {

• 		char *dir = malloc(strlen(filestr) + 2);
  

• 		sprintf(dir, "%s/", filestr);
  

• 		char *dir = malloc(strlen(relative_path) + 2);
  

• 		sprintf(dir, "%s/", relative_path);
  	if(alpm_filelist_contains(alpm_pkg_get_files(dbpkg), dir)) {
  		_alpm_log(handle, ALPM_LOG_DEBUG,
  				"checking if all files in %s belong to %s\n",
  

@@ -571,22 +583,6 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, free(dir); }

• 	/* check if a component of the filepath was a link. canonicalize the path
  

• 	 * and look for it in the old package. note that the actual file under
  

• 	 * consideration cannot itself be a link, as it might be unowned- path
  

• 	 * components can be safely checked as all directories are "unowned". */
  

• 	if(!resolved_conflict && dbpkg && !S_ISLNK(lsbuf.st_mode)) {
  

• 		char rpath[PATH_MAX];
  

• 		if(realpath(path, rpath)) {
  

• 			const char *relative_rpath = rpath + rootlen;
  

• 			if(alpm_filelist_contains(alpm_pkg_get_files(dbpkg), relative_rpath)) {
  

• 				_alpm_log(handle, ALPM_LOG_DEBUG,
  

• 						"package contained the resolved realpath\n");
  

• 				resolved_conflict = 1;
  

• 			}
  

• 		}
  

• 	}
  

• /* is the file unowned and in the backup list of the new package? */
  if(!resolved_conflict && _alpm_needbackup(filestr, p1)) {
  	alpm_list_t *local_pkgs = _alpm_db_get_pkgcache(handle->db_local);
  

diff --git a/src/common/util-common.c b/src/common/util-common.c index 7145e49..c2422e0 100644 --- a/src/common/util-common.c +++ b/src/common/util-common.c @@ -73,6 +73,49 @@ char *mdirname(const char *path) return strdup("."); }

+/** Resolve the canonicalized absolute path of a symlink.

• • @param path path to resolve
• • @param resolved_path destination for the resolved path, will be malloc'd if
• • NULL
• • @return the resolved path
• */

+char *lrealpath(const char *path, char *resolved_path) +{

• const char *bname = mbasename(path);
• char *rpath = NULL, *dname = NULL;
• int success = 0;
• if(strcmp(path, ".") == 0 || strcmp(path, "..") == 0) {

• /* the entire path needs to be resolved */
  

• return realpath(path, resolved_path);
  

• }
• if(!(dname = mdirname(path))) {

• goto cleanup;
  

• }
• if(!(rpath = realpath(dname, NULL))) {

• goto cleanup;
  

• }
• if(!resolved_path) {

• if(!(resolved_path = malloc(strlen(rpath) + strlen(bname) + 2))) {
  

• 	goto cleanup;
  

• }
  

• }
• strcpy(resolved_path, rpath);
• if(resolved_path[strlen(resolved_path) - 1] != '/') {

• strcat(resolved_path, "/");
  

• }
• strcat(resolved_path, bname);
• success = 1;

+cleanup:

• free(dname);
• free(rpath);
• return (success ? resolved_path : NULL);

+}

#ifndef HAVE_STRNDUP /* A quick and dirty implementation derived from glibc */ /** Determines the length of a fixed-size string. diff --git a/src/common/util-common.h b/src/common/util-common.h index 04d4e9d..b3a4df1 100644 --- a/src/common/util-common.h +++ b/src/common/util-common.h @@ -22,6 +22,7 @@

const char *mbasename(const char *path); char *mdirname(const char *path); +char *lrealpath(const char *path, char *resolved_path);

#ifndef HAVE_STRNDUP char *strndup(const char *s, size_t n); diff --git a/test/pacman/tests/fileconflict007.py b/test/pacman/tests/fileconflict007.py index b61ddb4..7fe65ed 100644 --- a/test/pacman/tests/fileconflict007.py +++ b/test/pacman/tests/fileconflict007.py @@ -16,5 +16,3 @@ self.addrule("PKG_EXIST=pkg") self.addrule("PKG_VERSION=pkg|1.0-2") self.addrule("FILE_TYPE=dir/symdir/|dir")

-self.expectfailure = True diff --git a/test/pacman/tests/sync701.py b/test/pacman/tests/sync701.py index 912c794..590845f 100644 --- a/test/pacman/tests/sync701.py +++ b/test/pacman/tests/sync701.py @@ -19,5 +19,3 @@ self.addrule("PKG_VERSION=pkg1|1.0-2") self.addrule("PKG_EXIST=pkg2") self.addrule("FILE_TYPE=lib|dir")

-self.expectfailure = True diff --git a/test/pacman/tests/sync702.py b/test/pacman/tests/sync702.py index 8f4c0ad..c3e2320 100644 --- a/test/pacman/tests/sync702.py +++ b/test/pacman/tests/sync702.py @@ -19,5 +19,3 @@ self.addrule("PKG_VERSION=pkg2|1.0-2") self.addrule("PKG_EXIST=pkg1") self.addrule("FILE_TYPE=lib|dir")

-self.expectfailure = True

Signed-off-by: Andrew Gregory andrew.gregory.8@gmail.com ---

lrealpath definition moved to query_fileowner patch.

lib/libalpm/conflict.c | 39 ++++++++++++++++++------------------ test/pacman/tests/fileconflict007.py | 2 -- test/pacman/tests/symlink020.py | 20 ++++++++++++++++++ 3 files changed, 40 insertions(+), 21 deletions(-) create mode 100644 test/pacman/tests/symlink020.py

diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index d44a459..ab9546c 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -505,6 +505,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, size_t pathlen;

pathlen = snprintf(path, PATH_MAX, "%s%s", handle->root, filestr); + relative_path = path + rootlen;

/* stat the file - if it exists, do some checks */ if(_alpm_lstat(path, &lsbuf) != 0) { @@ -513,7 +514,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,

_alpm_log(handle, ALPM_LOG_DEBUG, "checking possible conflict: %s\n", path);

- if(filestr[strlen(filestr) - 1] == '/') { + if(path[pathlen - 1] == '/') { if(S_ISDIR(lsbuf.st_mode)) { _alpm_log(handle, ALPM_LOG_DEBUG, "file is a directory, not a conflict\n"); continue; @@ -522,9 +523,25 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, * not include the trailing slash. This allows things like file -> * directory replacements. */ path[pathlen - 1] = '\0'; - }

- relative_path = path + rootlen; + /* Check if the directory was a file in dbpkg */ + if(alpm_filelist_contains(alpm_pkg_get_files(dbpkg), relative_path)) { + size_t fslen = strlen(filestr); + _alpm_log(handle, ALPM_LOG_DEBUG, + "replacing package file with a directory, not a conflict\n"); + resolved_conflict = 1; + + /* go ahead and skip any files inside filestr as they will + * necessarily be resolved by replacing the file with a dir + * NOTE: afterward, j will point to the last file inside filestr */ + for( ; j->next; j = j->next) { + const char *filestr2 = j->next->data; + if(strncmp(filestr, filestr2, fslen) != 0) { + break; + } + } + } + }

/* Check remove list (will we remove the conflicting local file?) */ for(k = rem; k && !resolved_conflict; k = k->next) { @@ -573,22 +590,6 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, free(dir); }

- /* check if a component of the filepath was a link. canonicalize the path - * and look for it in the old package. note that the actual file under - * consideration cannot itself be a link, as it might be unowned- path - * components can be safely checked as all directories are "unowned". */ - if(!resolved_conflict && dbpkg && !S_ISLNK(lsbuf.st_mode)) { - char rpath[PATH_MAX]; - if(realpath(path, rpath)) { - const char *relative_rpath = rpath + rootlen; - if(alpm_filelist_contains(alpm_pkg_get_files(dbpkg), relative_rpath)) { - _alpm_log(handle, ALPM_LOG_DEBUG, - "package contained the resolved realpath\n"); - resolved_conflict = 1; - } - } - } - /* is the file unowned and in the backup list of the new package? */ if(!resolved_conflict && _alpm_needbackup(relative_path, p1)) { alpm_list_t *local_pkgs = _alpm_db_get_pkgcache(handle->db_local); diff --git a/test/pacman/tests/fileconflict007.py b/test/pacman/tests/fileconflict007.py index b61ddb4..7fe65ed 100644 --- a/test/pacman/tests/fileconflict007.py +++ b/test/pacman/tests/fileconflict007.py @@ -16,5 +16,3 @@ self.addrule("PKG_EXIST=pkg") self.addrule("PKG_VERSION=pkg|1.0-2") self.addrule("FILE_TYPE=dir/symdir/|dir") - -self.expectfailure = True diff --git a/test/pacman/tests/symlink020.py b/test/pacman/tests/symlink020.py new file mode 100644 index 0000000..343add2 --- /dev/null +++ b/test/pacman/tests/symlink020.py @@ -0,0 +1,20 @@ +self.description = "symlink -> dir replacment" + +lp1 = pmpkg("pkg1") +lp1.files = ["usr/lib/foo", + "lib -> usr/lib/"] +self.addpkg2db("local", lp1) + +lp1 = pmpkg("pkg2") +lp1.files = ["usr/lib/bar"] +self.addpkg2db("local", lp1) + +sp = pmpkg("pkg1", "1.0-2") +sp.files = ["lib/bar"] +self.addpkg2db("sync", sp) + +self.args = "-S %s" % sp.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("FILE_TYPE=lib|dir") +self.addrule("FILE_TYPE=lib/bar|file")

On 27/04/13 10:00, Andrew Gregory wrote:

Signed-off-by: Andrew Gregory andrew.gregory.8@gmail.com

lib/libalpm/add.c | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 1d9db60..0b8aedf 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -204,19 +204,17 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, * D | 10 | 11 | 12 * * 1,2,3- extract, no magic necessary. lstat (_alpm_lstat) will fail here.

• *  4,5,6,7,8- conflict checks should have caught this. either overwrite
  

• *  4,5,6,7,8,9- conflict checks should have caught this. either overwrite
  

  •  or backup the file.
    

• *  9- follow the symlink, hopefully it is a directory, check it.
  

• *  10- file replacing directory- don't allow it.
  

• *  11- don't extract symlink- a dir exists here. we don't want links to
  

• *      links, etc.
  

• *  10,11- file replacing directory- don't allow it.
  

  • 12- skip extraction, dir already exists.
  */

• /* do both a lstat and a stat, so we can see what symlinks point to */ struct stat lsbuf, sbuf;
• if(_alpm_lstat(filename, &lsbuf) != 0 || stat(filename, &sbuf) != 0) {

• /* cases 1,2,3: couldn't stat an existing file, skip all backup checks */
  

• if(stat(filename, &sbuf) != 0 || _alpm_lstat(filename, &lsbuf) != 0) {

• /* cases 1,2,3: file doesn't exist or is a broken symlink,
  

•  * skip all backup checks */
  

• /* TODO: should we really treat broken symlinks as if they don't exist? */
  

NO! We definitely should not...

In fact, I'd like to see this patch result in this:

* (F=file, N=node, S=symlink, D=dir) * | F/N/S | D * non-existent | 1 | 2 * F/N/S | 3 | 4 * D | 5 | 6

because now there is no difference between a file and a symlink. Which probably means getting rid of the lstat call (although I did not look at the code to confirm...)

} else { if(S_ISDIR(lsbuf.st_mode)) { if(S_ISDIR(entrymode)) { @@ -243,23 +241,8 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, archive_read_data_skip(archive); return 1; }

• } else if(S_ISLNK(lsbuf.st_mode) && S_ISDIR(entrymode)) {
  

• 	/* case 9: existing symlink, dir in package */
  

• 	if(S_ISDIR(sbuf.st_mode)) {
  

• 		/* the symlink on FS is to a directory, so we'll use it */
  

• 		_alpm_log(handle, ALPM_LOG_DEBUG, "extract: skipping symlink overwrite of %s\n",
  

• 				filename);
  

• 		archive_read_data_skip(archive);
  

• 		return 0;
  

• 	} else {
  

• 		/* this is BAD. symlink was not to a directory */
  

• 		_alpm_log(handle, ALPM_LOG_ERROR, _("extract: symlink %s does not point to dir\n"),
  

• 				filename);
  

• 		archive_read_data_skip(archive);
  

• 		return 1;
  

• 	}
  

• } else if(S_ISREG(lsbuf.st_mode) && S_ISDIR(entrymode)) {
  

• 	/* case 6: trying to overwrite file with dir */
  

• } else if(!S_ISDIR(lsbuf.st_mode) && S_ISDIR(entrymode)) {
  

• 	/* case 6,9: trying to overwrite file with dir */
  _alpm_log(handle, ALPM_LOG_DEBUG, "extract: overwriting file with dir %s\n",
  		filename);
  

  } else if(S_ISREG(entrymode)) {

On 11/05/13 12:21, Andrew Gregory wrote:

Signed-off-by: Andrew Gregory andrew.gregory.8@gmail.com

Note the newly modified test at the bottom.

lib/libalpm/add.c | 56 +++++++++++++---------------------------- test/pacman/tests/upgrade045.py | 2 +- 2 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 3ef81e3..49f36ce 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -197,30 +197,25 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, * to get 'right'. Here are the possibilities, with the filesystem * on the left and the package on the top: * (F=file, N=node, S=symlink, D=dir)

• *               |  F/N  |  S  |  D
  

• *  non-existent |   1   |  2  |  3
  

• *  F/N          |   4   |  5  |  6
  

• *  S            |   7   |  8  |  9
  

• *  D            |   10  |  11 |  12
  

• *               |  F/N  |   D
  

• *  non-existent |   1   |   2
  

• *  F/N          |   3   |   4
  

• *  D            |   5   |   6
  

• *  1,2,3- extract, no magic necessary. lstat (_alpm_lstat) will fail here.
  

• *  4,5,6,7,8- conflict checks should have caught this. either overwrite
  

• *  1,2- extract, no magic necessary. lstat (_alpm_lstat) will fail here.
  

• *  3,4- conflict checks should have caught this. either overwrite
  

  •  or backup the file.
    

• *  9- follow the symlink, hopefully it is a directory, check it.
  

• *  10- file replacing directory- don't allow it.
  

• *  11- don't extract symlink- a dir exists here. we don't want links to
  

• *      links, etc.
  

• *  12- skip extraction, dir already exists.
  

• *  5- file replacing directory- don't allow it.
  

• *  6- skip extraction, dir already exists.
  

  */

• /* do both a lstat and a stat, so we can see what symlinks point to */
• struct stat lsbuf, sbuf;
• if(_alpm_lstat(filename, &lsbuf) != 0 || stat(filename, &sbuf) != 0) {

• /* cases 1,2,3: couldn't stat an existing file, skip all backup checks */
  

• struct stat lsbuf;
• if(_alpm_lstat(filename, &lsbuf) != 0) {

• /* cases 1,2: file doesn't exist, skip all backup checks */
  

  } else { if(S_ISDIR(lsbuf.st_mode)) { if(S_ISDIR(entrymode)) {

• 		/* case 12: existing dir, ignore it */
  

• 		/* case 6: existing dir, ignore it */
  	if(lsbuf.st_mode != entrymode) {
  		/* if filesystem perms are different than pkg perms, warn user */
  		mode_t mask = 07777;
  

@@ -237,33 +232,18 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, archive_read_data_skip(archive); return 0; } else {

• 		/* case 10/11: trying to overwrite dir with file/symlink, don't allow it */
  

• 		/* case 5: trying to overwrite dir with file, don't allow it */
  	_alpm_log(handle, ALPM_LOG_ERROR, _("extract: not overwriting dir with file %s\n"),
  			filename);
  	archive_read_data_skip(archive);
  	return 1;
  }
  

• } else if(S_ISLNK(lsbuf.st_mode) && S_ISDIR(entrymode)) {
  

• 	/* case 9: existing symlink, dir in package */
  

• 	if(S_ISDIR(sbuf.st_mode)) {
  

• 		/* the symlink on FS is to a directory, so we'll use it */
  

• 		_alpm_log(handle, ALPM_LOG_DEBUG, "extract: skipping symlink overwrite of %s\n",
  

• 				filename);
  

• 		archive_read_data_skip(archive);
  

• 		return 0;
  

• 	} else {
  

• 		/* this is BAD. symlink was not to a directory */
  

• 		_alpm_log(handle, ALPM_LOG_ERROR, _("extract: symlink %s does not point to dir\n"),
  

• 				filename);
  

• 		archive_read_data_skip(archive);
  

• 		return 1;
  

• 	}
  

• } else if(S_ISREG(lsbuf.st_mode) && S_ISDIR(entrymode)) {
  

• 	/* case 6: trying to overwrite file with dir */
  

• } else if(S_ISDIR(entrymode)) {
  

• 	/* case 4: trying to overwrite file with dir */
  _alpm_log(handle, ALPM_LOG_DEBUG, "extract: overwriting file with dir %s\n",
  		filename);
  

• } else if(S_ISREG(entrymode)) {
  

• 	/* case 4,7: */
  

• } else {
  

• 	/* case 3: */
  /* if file is in NoUpgrade, don't touch it */
  if(alpm_list_find(handle->noupgrade, entryname, _alpm_fnmatch)) {
  	notouch = 1;
  

@@ -288,8 +268,6 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive, } } }

• /* else if(S_ISLNK(entrymode)) */
  

• /* case 5,8: don't need to do anything special */
  

  }

  /* we need access to the original entryname later after calls to

diff --git a/test/pacman/tests/upgrade045.py b/test/pacman/tests/upgrade045.py index 3b7f476..e165ba3 100644 --- a/test/pacman/tests/upgrade045.py +++ b/test/pacman/tests/upgrade045.py @@ -14,4 +14,4 @@

self.addrule("PACMAN_RETCODE=0") self.addrule("PKG_VERSION=foo|1.0-2") -self.addrule("FILE_EXIST=etc/foo.cfg") +self.addrule("LINK_EXIST=etc/foo.cfg")

Looks good. For that pactest, add a FILE_EXISTS=/etc/foo.cfg.pacnew too.

Also, in that pactest:

p1.files = ["etc/foo.cfg*"]

what is the "*" for there?

Signed-off-by: Andrew Gregory andrew.gregory.8@gmail.com --- src/pacman/query.c | 90 +++++++++++------------------------------------------- 1 file changed, 17 insertions(+), 73 deletions(-)

diff --git a/src/pacman/query.c b/src/pacman/query.c index f051571..6befcae 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -133,11 +133,11 @@ static int query_fileowner(alpm_list_t *targets) packages = alpm_db_get_pkgcache(db_local);

for(t = targets; t; t = alpm_list_next(t)) { - char *filename = NULL, *dname = NULL, *rpath = NULL; - const char *bname; + char *filename = NULL; + char rpath[PATH_MAX], *rel_path; struct stat buf; alpm_list_t *i; - size_t len, is_dir, bname_len, pbname_len; + size_t len, is_dir; unsigned int found = 0;

if((filename = strdup(t->data)) == NULL) { @@ -165,82 +165,28 @@ static int query_fileowner(alpm_list_t *targets) } }

- is_dir = S_ISDIR(buf.st_mode) ? 1 : 0; - if(is_dir) { - /* the entire filename is safe to resolve if we know it points to a dir, - * and it's necessary in case it ends in . or .. */ - dname = realpath(filename, NULL); - bname = mbasename(dname); - rpath = mdirname(dname); - } else { - bname = mbasename(filename); - dname = mdirname(filename); - rpath = realpath(dname, NULL); - } - - bname_len = strlen(bname); - pbname_len = bname_len + is_dir; - - if(!dname || !rpath) { + if(!lrealpath(filename, rpath)) { pm_printf(ALPM_LOG_ERROR, _("cannot determine real path for '%s': %s\n"), filename, strerror(errno)); goto targcleanup; }

- for(i = packages; i && (!found || is_dir); i = alpm_list_next(i)) { - alpm_pkg_t *info = i->data; - alpm_filelist_t *filelist = alpm_pkg_get_files(info); - size_t j; - - for(j = 0; j < filelist->count; j++) { - const alpm_file_t *file = filelist->files + j; - char *ppath; - const char *pkgfile = file->name; - size_t pkgfile_len = strlen(pkgfile); - - /* make sure pkgfile and target are of the same type */ - if(is_dir != (pkgfile[pkgfile_len - 1] == '/')) { - continue; - } - - /* make sure pkgfile is long enough */ - if(pkgfile_len < pbname_len) { - continue; - } - - /* make sure pbname_len takes us to the start of a path component */ - if(pbname_len != pkgfile_len && pkgfile[pkgfile_len - pbname_len - 1] != '/') { - continue; - } + if(strncmp(rpath, path, rootlen) != 0) { + /* file is outside root, we know nothing can own it */ + pm_printf(ALPM_LOG_ERROR, _("No package owns %s\n"), filename); + goto targcleanup; + }

- /* compare basename with bname */ - if(strncmp(pkgfile + pkgfile_len - pbname_len, bname, bname_len) != 0) { - continue; - } + rel_path = rpath + rootlen;

- /* concatenate our dirname and the root path */ - if(rootlen + 1 + pkgfile_len - pbname_len > PATH_MAX) { - path[rootlen] = '\0'; /* reset path for error message */ - pm_printf(ALPM_LOG_ERROR, _("path too long: %s%s\n"), path, pkgfile); - continue; - } - strncpy(path + rootlen, pkgfile, pkgfile_len - pbname_len); - path[rootlen + pkgfile_len - pbname_len] = '\0'; - - ppath = realpath(path, NULL); - if(!ppath) { - pm_printf(ALPM_LOG_ERROR, _("cannot determine real path for '%s': %s\n"), - path, strerror(errno)); - continue; - } + if((is_dir = S_ISDIR(buf.st_mode))) { + strcat(rpath, "/"); + }

- if(strcmp(ppath, rpath) == 0) { - print_query_fileowner(filename, info); - found = 1; - free(ppath); - break; - } - free(ppath); + for(i = packages; i && (!found || is_dir); i = alpm_list_next(i)) { + if(alpm_filelist_contains(alpm_pkg_get_files(i->data), rel_path)) { + print_query_fileowner(rpath, i->data); + found = 1; } } if(!found) { @@ -252,8 +198,6 @@ targcleanup: ret++; } free(filename); - free(rpath); - free(dname); }

return ret;

Packages removed due to conflicts are always removed at the beginning of the transaction and as such can be included in the check for whether all owners of a directory will be removed in a transaction. Installed versions of packages being upgraded, other than the one with the conflict, cannot be used because our transaction ordering is not intelligent enough to ensure that they are removed prior to the installation of the conflicted package.

Also, return false from dir_belongsto_pkgs on errors. Previously, we simply continued which could return true even if we were unable to actually establish that the package owned the entire tree.

Signed-off-by: Andrew Gregory andrew.gregory.8@gmail.com --- lib/libalpm/conflict.c | 133 +++++++++++++++++------------------ test/pacman/tests/fileconflict030.py | 17 +++++ 2 files changed, 82 insertions(+), 68 deletions(-) create mode 100644 test/pacman/tests/fileconflict030.py

diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 08c1cbe..35ab6e8 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -299,94 +299,73 @@ void _alpm_fileconflict_free(alpm_fileconflict_t *conflict) }

/** - * @brief Recursively checks if a package owns all subdirectories and files in - * a directory. + * @brief Recursively checks if a set of packages own all subdirectories and + * files in a directory. * * @param handle the context handle * @param dirpath path of the directory to check - * @param pkg package being checked against + * @param pkgs packages being checked against * - * @return 1 if a package owns all subdirectories and files or a directory - * cannot be opened, 0 otherwise + * @return 1 if a package owns all subdirectories and files, 0 otherwise */ -static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath, - alpm_pkg_t *pkg) +static int dir_belongsto_pkgs(alpm_handle_t *handle, const char *dirpath, + alpm_list_t *pkgs) { - alpm_list_t *i; - struct stat sbuf; - char path[PATH_MAX]; - char abspath[PATH_MAX]; + char path[PATH_MAX], full_path[PATH_MAX]; DIR *dir; 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)) { - _alpm_log(handle, ALPM_LOG_DEBUG, - "directory %s not in package %s\n", dirpath, pkg->name); - 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 - * package, pacman does not sort this to ensure all required directory - * "removals" happen before installation of file/symlink */ - - /* check that no other _installed_ package owns the directory */ - for(i = _alpm_db_get_pkgcache(handle->db_local); i; i = i->next) { - if(pkg == i->data) { - continue; - } - - if(alpm_filelist_contains(alpm_pkg_get_files(i->data), dirpath)) { - _alpm_log(handle, ALPM_LOG_DEBUG, - "file %s also in package %s\n", dirpath, - ((alpm_pkg_t*)i->data)->name); - return 0; - } - }

- /* check all files in directory are owned by the package */ - snprintf(abspath, PATH_MAX, "%s%s", root, dirpath); - dir = opendir(abspath); + snprintf(full_path, PATH_MAX, "%s%s", handle->root, dirpath); + dir = opendir(full_path); if(dir == NULL) { - return 1; + return 0; }

while((ent = readdir(dir)) != NULL) { const char *name = ent->d_name; + int owned = 0; + alpm_list_t *i; + struct stat sbuf;

if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) { continue; } + snprintf(path, PATH_MAX, "%s%s", dirpath, name); - snprintf(abspath, PATH_MAX, "%s%s", root, path); - if(stat(abspath, &sbuf) != 0) { - continue; - } - if(S_ISDIR(sbuf.st_mode)) { - if(dir_belongsto_pkg(handle, path, pkg)) { - continue; - } else { - closedir(dir); - return 0; - } - } else { - if(alpm_filelist_contains(alpm_pkg_get_files(pkg), path)) { - continue; - } else { - closedir(dir); - _alpm_log(handle, ALPM_LOG_DEBUG, - "unowned file %s found in directory\n", path); - return 0; + snprintf(full_path, PATH_MAX, "%s%s", handle->root, path); + + for(i = pkgs; i && !owned; i = i->next) { + if(alpm_filelist_contains(alpm_pkg_get_files(i->data), path)) { + owned = 1; } } + + if(owned && stat(full_path, &sbuf) != 0 && S_ISDIR(sbuf.st_mode)) { + owned = dir_belongsto_pkgs(handle, path, pkgs); + } + + if(!owned) { + closedir(dir); + _alpm_log(handle, ALPM_LOG_DEBUG, + "unowned file %s found in directory\n", path); + return 0; + } } closedir(dir); return 1; }

+static alpm_list_t *alpm_db_find_file_owners(alpm_db_t* db, const char *path) +{ + alpm_list_t *i, *owners = NULL; + for(i = alpm_db_get_pkgcache(db); i; i = i->next) { + if(alpm_filelist_contains(alpm_pkg_get_files(i->data), path)) { + owners = alpm_list_add(owners, i->data); + } + } + return owners; +} + /** * @brief Find file conflicts that may occur during the transaction. * @@ -571,14 +550,32 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, }

/* check if all files of the dir belong to the installed pkg */ - if(!resolved_conflict && S_ISDIR(lsbuf.st_mode) && dbpkg) { + if(!resolved_conflict && S_ISDIR(lsbuf.st_mode)) { + alpm_list_t *owners; char *dir = malloc(strlen(relative_path) + 2); sprintf(dir, "%s/", relative_path); - if(alpm_filelist_contains(alpm_pkg_get_files(dbpkg), dir)) { - _alpm_log(handle, ALPM_LOG_DEBUG, - "checking if all files in %s belong to %s\n", - dir, dbpkg->name); - resolved_conflict = dir_belongsto_pkg(handle, dir, dbpkg); + + owners = alpm_db_find_file_owners(handle->db_local, dir); + if(owners) { + alpm_list_t *pkgs = NULL, *diff; + + if(dbpkg) { + pkgs = alpm_list_add(pkgs, dbpkg); + } + pkgs = alpm_list_join(pkgs, alpm_list_copy(rem)); + if((diff = alpm_list_diff(owners, pkgs, _alpm_pkg_cmp))) { + /* dir is owned by files we aren't removing */ + /* TODO: with better commit ordering, we may be able to check + * against upgrades as well */ + alpm_list_free(diff); + } else { + _alpm_log(handle, ALPM_LOG_DEBUG, + "checking if all files in %s belong to removed packages\n", + dir); + resolved_conflict = dir_belongsto_pkgs(handle, dir, owners); + } + alpm_list_free(pkgs); + alpm_list_free(owners); } free(dir); } diff --git a/test/pacman/tests/fileconflict030.py b/test/pacman/tests/fileconflict030.py new file mode 100644 index 0000000..1de7781 --- /dev/null +++ b/test/pacman/tests/fileconflict030.py @@ -0,0 +1,17 @@ +self.description = "Dir->file transition filesystem conflict resolved by removal" + +lp1 = pmpkg("foo") +lp1.files = ["foo/"] +self.addpkg2db("local", lp1) + +sp1 = pmpkg("bar") +sp1.conflicts = ["foo"] +sp1.files = ["foo"] +self.addpkg2db("sync", sp1) + +self.args = "-S %s --ask=4" % sp1.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=bar") +self.addrule("!PKG_EXIST=foo") +self.addrule("FILE_EXIST=foo")