From 8d5818e214bf973ee24ae69d13ea15d28d384030 Mon Sep 17 00:00:00 2001
From: obarun <eric@obarun.org>
Date: Mon, 18 Mar 2019 13:43:55 +1100
Subject: [PATCH] be sure to remove live/run/state/uid/treename before a copy
---
src/lib66/tree_copy_tmp.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/lib66/tree_copy_tmp.c b/src/lib66/tree_copy_tmp.c
index f84f6fc1..bf714298 100644
--- a/src/lib66/tree_copy_tmp.c
+++ b/src/lib66/tree_copy_tmp.c
@@ -185,6 +185,11 @@ int tree_copy_tmp(char const *workdir, ssexec_t *info)
r = scan_mode(saresolve.s,S_IFDIR) ;
if (r < 0) strerr_dief2x(111,resolve," conflicting format") ;
+ if (r)
+ {
+ if (rm_rf(saresolve.s) <0) goto err ;
+ r = 0 ;
+ }
if (!r)
{
saresolve.len = newlen ;
--
GitLab