diff options
| author | Andrew Gregory <andrew.gregory.8@gmail.com> | 2013-04-13 02:37:56 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-06-03 05:33:47 +0200 |
| commit | 5cfa4ec47ed6240fecb1c2a9fd95de5bdc58a8b8 (patch) | |
| tree | e8d7720c44591267568694051313747df2b53b14 /lib/libalpm/remove.c | |
| parent | 0c41663c7b5a9d73ea49c20b74149d12f0fcd26c (diff) | |
| download | pacman-5cfa4ec47ed6240fecb1c2a9fd95de5bdc58a8b8.tar.gz pacman-5cfa4ec47ed6240fecb1c2a9fd95de5bdc58a8b8.tar.xz | |
alpm_filelist: remove resolved_path
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm/remove.c')
| -rw-r--r-- | lib/libalpm/remove.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index d0cd613c..652aa501 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -462,7 +462,6 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, "keeping directory %s (could not count files)\n", file); } else if(newpkg && alpm_filelist_contains(alpm_pkg_get_files(newpkg), fileobj->name)) { - /* newpkg's filelist should have already been resolved by the caller */ _alpm_log(handle, ALPM_LOG_DEBUG, "keeping directory %s (in new package)\n", file); } else if(dir_is_mountpoint(handle, file, &buf)) { @@ -484,9 +483,6 @@ static int unlink_file(alpm_handle_t *handle, alpm_pkg_t *oldpkg, continue; } filelist = alpm_pkg_get_files(local_pkg); - /* This is too slow and only covers a rare case - Disable for now... */ - /* _alpm_filelist_resolve(handle, filelist); */ if(alpm_filelist_contains(filelist, fileobj->name)) { _alpm_log(handle, ALPM_LOG_DEBUG, "keeping directory %s (owned by %s)\n", file, local_pkg->name); @@ -584,7 +580,6 @@ static int remove_package_files(alpm_handle_t *handle, * so this removal operation doesn't kill them */ /* old package backup list */ newfiles = alpm_pkg_get_files(newpkg); - _alpm_filelist_resolve(handle, newfiles); for(b = alpm_pkg_get_backup(newpkg); b; b = b->next) { const alpm_backup_t *backup = b->data; /* safety check (fix the upgrade026 pactest) */ |