From: Tim Kientzle <kientzle@gmail.com>
Date: Mon, 12 Apr 2010 00:17:26 +0000 (-0400)
Subject: If it's not an error to skip an older file, then don't set an error message.
X-Git-Tag: v3.0.0a~1109
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5133976c23bcfb2f18f25b21c12693a49cc2e3c;p=thirdparty%2Flibarchive.git

If it's not an error to skip an older file, then don't set an error message.

SVN-Revision: 2239
---

diff --git a/libarchive/archive_write_disk.c b/libarchive/archive_write_disk.c
index 28225d141..ad6622b3d 100644
--- a/libarchive/archive_write_disk.c
+++ b/libarchive/archive_write_disk.c
@@ -1088,8 +1088,6 @@ restore_entry(struct archive_write_disk *a)
 		    &&  !S_ISDIR(a->st.st_mode)) {
 			if (!older(&(a->st), a->entry)) {
 				archive_entry_unset_size(a->entry);
-				archive_set_error(&a->archive, 0,
-				    "File on disk is not older; skipping.");
 				return (ARCHIVE_OK);
 			}
 		}