From 208c31d74dfce568505317aab57d63d62cb4f8cf Mon Sep 17 00:00:00 2001
From: Alexander Tratsevskiy <at@calculate.ru>
Date: Fri, 20 May 2022 16:29:52 +0300
Subject: [PATCH] sys-apps/calculate-toolkit: fix copy

---
 ...12.ebuild => calculate-toolkit-0.3.0-r13.ebuild} |  1 +
 .../files/calculate-toolkit-0.3.0-check_files.patch | 13 +++++++++++++
 2 files changed, 14 insertions(+)
 rename sys-apps/calculate-toolkit/{calculate-toolkit-0.3.0-r12.ebuild => calculate-toolkit-0.3.0-r13.ebuild} (95%)
 create mode 100644 sys-apps/calculate-toolkit/files/calculate-toolkit-0.3.0-check_files.patch

diff --git a/sys-apps/calculate-toolkit/calculate-toolkit-0.3.0-r12.ebuild b/sys-apps/calculate-toolkit/calculate-toolkit-0.3.0-r13.ebuild
similarity index 95%
rename from sys-apps/calculate-toolkit/calculate-toolkit-0.3.0-r12.ebuild
rename to sys-apps/calculate-toolkit/calculate-toolkit-0.3.0-r13.ebuild
index 226a3380e..afc75362c 100644
--- a/sys-apps/calculate-toolkit/calculate-toolkit-0.3.0-r12.ebuild
+++ b/sys-apps/calculate-toolkit/calculate-toolkit-0.3.0-r13.ebuild
@@ -32,4 +32,5 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fix-ccg.patch
 	"${FILESDIR}"/${P}-check_mkdir.patch
 	"${FILESDIR}"/${P}-ssh_keys.patch
+	"${FILESDIR}"/${P}-check_files.patch
 )
diff --git a/sys-apps/calculate-toolkit/files/calculate-toolkit-0.3.0-check_files.patch b/sys-apps/calculate-toolkit/files/calculate-toolkit-0.3.0-check_files.patch
new file mode 100644
index 000000000..b93419e79
--- /dev/null
+++ b/sys-apps/calculate-toolkit/files/calculate-toolkit-0.3.0-check_files.patch
@@ -0,0 +1,13 @@
+diff --git a/cl-lxc b/cl-lxc
+index 8c29bde..4fc3ac1 100755
+--- a/cl-lxc
++++ b/cl-lxc
+@@ -616,7 +616,7 @@ upgrade_lxc() {
+ 
+ 	ebegin $"Copying ssh keys"
+ 	cp $path_work/$name_upgrading/rootfs$num_cur/etc/ssh/*_key* \
+-	   $path_work/$name_upgrading/rootfs$num_next/etc/ssh
++	   $path_work/$name_upgrading/rootfs$num_next/etc/ssh 2>/dev/null | true
+ 	eend
+ 
+ 	ebegin $"Preparing first boot setup script"