summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2015-02-04 05:48:31 +0100
committerAllan McRae <allan@archlinux.org>2015-02-12 04:25:44 +0100
commitba869597fb64f1101012df4b0d834ed5eced0b7c (patch)
tree46a3b6ada8e0f3c47e16374b5e00aa07efdb4e55
parent0c9f4329f8dd2a6eb6d7717998e71c3a17fd2583 (diff)
downloadpacman-ba869597fb64f1101012df4b0d834ed5eced0b7c.tar.gz
pacman-ba869597fb64f1101012df4b0d834ed5eced0b7c.tar.xz
Disable directory ownership warnings
There was a lot of confusion regarding these warnings, particularly for packages that create users post_install and then chown the directories. Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--lib/libalpm/add.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index 725f2b5c..5e2d0a15 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -220,8 +220,10 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
} else {
if(S_ISDIR(lsbuf.st_mode)) {
if(S_ISDIR(entrymode)) {
+#if 0
uid_t entryuid = archive_entry_uid(entry);
gid_t entrygid = archive_entry_gid(entry);
+#endif
/* case 6: existing dir, ignore it */
if(lsbuf.st_mode != entrymode) {
@@ -236,6 +238,11 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
entrymode & mask);
}
+#if 0
+ /* Disable this warning until our user management in packages has improved.
+ Currently many packages have to create users in post_install and chown the
+ directories. These all resulted in "false-positive" warnings. */
+
if((entryuid != lsbuf.st_uid) || (entrygid != lsbuf.st_gid)) {
_alpm_log(handle, ALPM_LOG_WARNING, _("directory ownership differs on %s\n"
"filesystem: %u:%u package: %u:%u\n"), filename,
@@ -245,6 +252,7 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
"filesystem: %u:%u package: %u:%u\n", filename,
lsbuf.st_uid, lsbuf.st_gid, entryuid, entrygid);
}
+#endif
_alpm_log(handle, ALPM_LOG_DEBUG, "extract: skipping dir extraction of %s\n",
filename);