[pacman-dev] [PATCH] Do not warn about missing files in NoExtract

Allan McRae allan at archlinux.org
Mon Dec 21 07:00:46 UTC 2015


The CheckSpace option checks the size of all files in a package being replaced
and gives a warning when it can not read the file.  However, files in NoExtract
are expected to be missing and should not be warned about.

Fixes FS#47470.

Signed-off-by: Allan McRae <allan at archlinux.org>
---
 lib/libalpm/diskspace.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c
index 5bb2173..b80139f 100644
--- a/lib/libalpm/diskspace.c
+++ b/lib/libalpm/diskspace.c
@@ -237,8 +237,10 @@ static int calculate_removed_size(alpm_handle_t *handle,
 		snprintf(path, PATH_MAX, "%s%s", handle->root, filename);
 
 		if(llstat(path, &st) == -1) {
-			_alpm_log(handle, ALPM_LOG_WARNING,
-					_("could not get file information for %s\n"), filename);
+			if(!alpm_option_match_noextract(handle, filename)) {
+				_alpm_log(handle, ALPM_LOG_WARNING,
+						_("could not get file information for %s\n"), filename);
+			}
 			continue;
 		}
 
-- 
2.6.4


More information about the pacman-dev mailing list