From bed6230f2596ddf1cf1a1a9f2e2bcc81eea19b3f Mon Sep 17 00:00:00 2001 From: Joonas Niilola Date: Wed, 5 Feb 2025 18:57:01 +0200 Subject: [PATCH] app-containers/incus: another 'incus file' fix in 6.9 Signed-off-by: Joonas Niilola --- .../incus-6.9-read-files-in-chunks.patch | 39 +++++++++++++++++++ ...ncus-6.9-r1.ebuild => incus-6.9-r2.ebuild} | 3 +- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 app-containers/incus/files/incus-6.9-read-files-in-chunks.patch rename app-containers/incus/{incus-6.9-r1.ebuild => incus-6.9-r2.ebuild} (98%) diff --git a/app-containers/incus/files/incus-6.9-read-files-in-chunks.patch b/app-containers/incus/files/incus-6.9-read-files-in-chunks.patch new file mode 100644 index 0000000000000..05c7b45c0e5d3 --- /dev/null +++ b/app-containers/incus/files/incus-6.9-read-files-in-chunks.patch @@ -0,0 +1,39 @@ +From f2ef7aa808e204c8714de40b29895ea596e2bb0e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?St=C3=A9phane=20Graber?= +Date: Sun, 2 Feb 2025 09:18:54 +0100 +Subject: [PATCH] incus/file/pull: Read files in chunks +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Stéphane Graber +--- + cmd/incus/file.go | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +diff --git a/cmd/incus/file.go b/cmd/incus/file.go +index 99467a0bfc5..4aad930acd8 100644 +--- a/cmd/incus/file.go ++++ b/cmd/incus/file.go +@@ -686,10 +686,17 @@ func (c *cmdFilePull) Run(cmd *cobra.Command, args []string) error { + return err + } + } else { +- _, err = io.Copy(writer, src) +- if err != nil { +- progress.Done("") +- return err ++ for { ++ // Read 1MB at a time. ++ _, err = io.CopyN(writer, src, 1024*1024*1024) ++ if err != nil { ++ if err == io.EOF { ++ break ++ } ++ ++ progress.Done("") ++ return err ++ } + } + } + diff --git a/app-containers/incus/incus-6.9-r1.ebuild b/app-containers/incus/incus-6.9-r2.ebuild similarity index 98% rename from app-containers/incus/incus-6.9-r1.ebuild rename to app-containers/incus/incus-6.9-r2.ebuild index 2554cf605f8b6..8b0952f3ad958 100644 --- a/app-containers/incus/incus-6.9-r1.ebuild +++ b/app-containers/incus/incus-6.9-r2.ebuild @@ -91,7 +91,8 @@ RESTRICT="test" GOPATH="${S}/_dist" -PATCHES=( "${FILESDIR}"/incus-6.9-ensure-leading-slash-in-all-paths.patch ) +PATCHES=( "${FILESDIR}"/incus-6.9-ensure-leading-slash-in-all-paths.patch + "${FILESDIR}"/incus-6.9-read-files-in-chunks.patch ) src_unpack() { verify-sig_src_unpack