diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2013-04-13 02:45:00 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-06-03 05:33:47 +0200 |
| commit | aa7e42db11ea545572a9519e88e2a6cdeeffb3bf (patch) | |
| tree | a1fdf2b0e1f9e72326573a3d03b68c969523b1b0 /lib/libalpm | |
| parent | 5cfa4ec47ed6240fecb1c2a9fd95de5bdc58a8b8 (diff) | |
| download | pacman-aa7e42db11ea545572a9519e88e2a6cdeeffb3bf.tar.gz pacman-aa7e42db11ea545572a9519e88e2a6cdeeffb3bf.tar.xz | |
conflict.c: do not ignore symlink<->dir conflicts
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm')
| -rw-r--r-- | lib/libalpm/conflict.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 896f48de..3121cc79 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. */ |