From: Nathan Wagner <nw@hydaspes.if.org>
Date: Mon, 3 Dec 2018 10:26:11 +0000 (+0000)
Subject: ignore non-empty directories at unlink
X-Git-Tag: v0.3.4~3
X-Git-Url: https://pd.if.org/git/?p=zpackage;a=commitdiff_plain;h=4b46503646910df3617d4f2d44112eddf75d902b

ignore non-empty directories at unlink
---

diff --git a/zpm-syncfs.c b/zpm-syncfs.c
index d4fe280..66e5aaa 100644
--- a/zpm-syncfs.c
+++ b/zpm-syncfs.c
@@ -635,6 +635,10 @@ static int remove_files(void *f, int ncols, char **vals, char **cols) {
 			case ENOENT:
 				/* TODO chatter if verbose */
 				break;
+			case ENOTEMPTY: /* fall through */
+			case EEXIST:
+				/* TODO chatter, or possibly require */
+				break;
 			default:
 				return seterror(conf, "can't stat %s: %s", dest, strerror(errno));
 		}