summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Pougnet <richard@pougnet.ca>2013-02-15 22:59:57 -0500
committerAllan McRae <allan@archlinux.org>2013-02-24 13:11:54 +1000
commit63baba13ecc003a0e083980dc7d036c66518d232 (patch)
treed07d5927217c937713d9fba284f473d96fd35e49
parent972528c021606934da85aef1d9223dea1d40e2c6 (diff)
downloadpacman-63baba13ecc003a0e083980dc7d036c66518d232.tar.xz
Provide full path names in warning messages
Fix FS#31556 by printing filename instead of entryname. Thus, removing a lot of confusion from the output. Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--lib/libalpm/add.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index a8284355..f70e2cb1 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -184,8 +184,9 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
/* if a file is in NoExtract then we never extract it */
if(alpm_list_find(handle->noextract, entryname, _alpm_fnmatch)) {
- _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in NoExtract, skipping extraction\n",
- entryname);
+ _alpm_log(handle, ALPM_LOG_DEBUG, "%s is in NoExtract,"
+ " skipping extraction of %s\n",
+ entryname, filename);
alpm_logaction(handle, ALPM_CALLER_PREFIX,
"note: %s is in NoExtract, skipping extraction\n", entryname);
archive_read_data_skip(archive);
@@ -224,21 +225,21 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
/* if filesystem perms are different than pkg perms, warn user */
mode_t mask = 07777;
_alpm_log(handle, ALPM_LOG_WARNING, _("directory permissions differ on %s\n"
- "filesystem: %o package: %o\n"), entryname, lsbuf.st_mode & mask,
+ "filesystem: %o package: %o\n"), filename, lsbuf.st_mode & mask,
entrymode & mask);
alpm_logaction(handle, ALPM_CALLER_PREFIX,
"warning: directory permissions differ on %s\n"
- "filesystem: %o package: %o\n", entryname, lsbuf.st_mode & mask,
+ "filesystem: %o package: %o\n", filename, lsbuf.st_mode & mask,
entrymode & mask);
}
_alpm_log(handle, ALPM_LOG_DEBUG, "extract: skipping dir extraction of %s\n",
- entryname);
+ filename);
archive_read_data_skip(archive);
return 0;
} else {
/* case 10/11: trying to overwrite dir with file/symlink, don't allow it */
_alpm_log(handle, ALPM_LOG_ERROR, _("extract: not overwriting dir with file %s\n"),
- entryname);
+ filename);
archive_read_data_skip(archive);
return 1;
}
@@ -247,20 +248,20 @@ static int extract_single_file(alpm_handle_t *handle, struct archive *archive,
if(S_ISDIR(sbuf.st_mode)) {
/* the symlink on FS is to a directory, so we'll use it */
_alpm_log(handle, ALPM_LOG_DEBUG, "extract: skipping symlink overwrite of %s\n",
- entryname);
+ filename);
archive_read_data_skip(archive);
return 0;
} else {
/* this is BAD. symlink was not to a directory */
_alpm_log(handle, ALPM_LOG_ERROR, _("extract: symlink %s does not point to dir\n"),
- entryname);
+ filename);
archive_read_data_skip(archive);
return 1;
}
} else if(S_ISREG(lsbuf.st_mode) && S_ISDIR(entrymode)) {
/* case 6: trying to overwrite file with dir */
_alpm_log(handle, ALPM_LOG_DEBUG, "extract: overwriting file with dir %s\n",
- entryname);
+ filename);
} else if(S_ISREG(entrymode)) {
/* case 4,7: */
/* if file is in NoUpgrade, don't touch it */