diff options
| author | Dan McGee <dan@archlinux.org> | 2012-07-11 03:16:37 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-08-01 15:52:41 +0200 |
| commit | 7520c0facb23887fe93057736834061c6dedfdec (patch) | |
| tree | 033ddfff33e8f2fa56253060d913213cb1504ee1 /lib/libalpm/conflict.c | |
| parent | 5c1ba2d5fd5263525a0355cdce900b58dc41c916 (diff) | |
| download | pacman-7520c0facb23887fe93057736834061c6dedfdec.tar.gz pacman-7520c0facb23887fe93057736834061c6dedfdec.tar.xz | |
Add more debug logging to dir_belongsto_pkg() function
Now that we pass in the handle, we might as well add logging.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/conflict.c')
| -rw-r--r-- | lib/libalpm/conflict.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index d6e5d8c6..6bfd256f 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -341,6 +341,8 @@ static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath, /* 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; } @@ -357,6 +359,9 @@ static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath, } 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; } } @@ -391,6 +396,8 @@ static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath, continue; } else { closedir(dir); + _alpm_log(handle, ALPM_LOG_DEBUG, + "unowned file %s found in directory\n", path); return 0; } } @@ -554,7 +561,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, sprintf(dir, "%s/", filestr); if(_alpm_filelist_contains(alpm_pkg_get_files(dbpkg), dir)) { _alpm_log(handle, ALPM_LOG_DEBUG, - "check if all files in %s belong to %s\n", + "checking if all files in %s belong to %s\n", dir, dbpkg->name); resolved_conflict = dir_belongsto_pkg(handle, dir, dbpkg); } |