diff --git a/lib/package_remove.c b/lib/package_remove.c index 53eb783d..f4e4c197 100644 --- a/lib/package_remove.c +++ b/lib/package_remove.c @@ -151,8 +151,9 @@ xbps_remove_pkg_files(prop_dictionary_t dict, const char *key) * Remove the object if possible. */ if (remove(path) == -1) { - xbps_warn_printf("can't remove %s `%s': %s\n", - curobj, file, strerror(errno)); + if (flags & XBPS_FLAG_VERBOSE) + xbps_warn_printf("can't remove %s `%s': %s\n", + curobj, file, strerror(errno)); } else { /* Success */ diff --git a/lib/package_unpack.c b/lib/package_unpack.c index f87c5a71..7c178822 100644 --- a/lib/package_unpack.c +++ b/lib/package_unpack.c @@ -169,7 +169,7 @@ unpack_archive(prop_dictionary_t pkg_repod, size_t nmetadata = 0, entry_idx = 0; const char *rootdir, *entry_pname, *transact; char *buf; - int rv, flags; + int rv, flags, xflags; bool preserve, update, replace_files_in_pkg_update; assert(ar != NULL); @@ -179,6 +179,7 @@ unpack_archive(prop_dictionary_t pkg_repod, preserve = update = false; rootdir = xbps_get_rootdir(); + xflags = xbps_get_flags(); if (chdir(rootdir) == -1) { xbps_error_printf("cannot chdir to rootdir for " @@ -415,8 +416,10 @@ unpack_archive(prop_dictionary_t pkg_repod, pkgname, version, strerror(rv)); goto out; } else { - xbps_warn_printf("ignoring existing " - "entry: %s\n", entry_pname); + if (xflags & XBPS_FLAG_VERBOSE) + xbps_warn_printf("ignoring existing " + "entry: %s\n", entry_pname); + RUN_PROGRESS_CB(); continue; }