[pacman-dev] [PATCH 6/8] unlink_file: treat symlinks like normal files

Andrew Gregory andrew.gregory.8 at gmail.com
Fri Apr 26 20:00:27 EDT 2013


We always want to work with the package file itself, not its target if
it's a symlink.

Signed-off-by: Andrew Gregory <andrew.gregory.8 at gmail.com>
---
 lib/libalpm/remove.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c
index 652aa50..0b4f80c 100644
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -442,11 +442,7 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg,
 		return 1;
 	}
 
-	/* we want to do a lstat here, and not a _alpm_lstat.
-	 * if a directory in the package is actually a directory symlink on the
-	 * filesystem, we want to work with the linked directory instead of the
-	 * actual symlink */
-	if(lstat(file, &buf)) {
+	if(_alpm_lstat(file, &buf)) {
 		_alpm_log(handle, ALPM_LOG_DEBUG, "file %s does not exist\n", file);
 		return 1;
 	}
-- 
1.8.2.1



More information about the pacman-dev mailing list