commit: 5f62fc3fce6c2a7a3252f03a7fe50cbd5cb1a25f Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sun Apr 27 19:23:48 2025 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Mon Apr 28 03:34:57 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f62fc3f
app-containers/incus: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> ...cus-6.9-ensure-leading-slash-in-all-paths.patch | 32 ------------------ .../files/incus-6.9-read-files-in-chunks.patch | 39 ---------------------- 2 files changed, 71 deletions(-) diff --git a/app-containers/incus/files/incus-6.9-ensure-leading-slash-in-all-paths.patch b/app-containers/incus/files/incus-6.9-ensure-leading-slash-in-all-paths.patch deleted file mode 100644 index a4647528c593..000000000000 --- a/app-containers/incus/files/incus-6.9-ensure-leading-slash-in-all-paths.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b726905c66050ac4229d53ce079a0bd05dbe900d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?St=C3=A9phane=20Graber?= <[email protected]> -Date: Thu, 30 Jan 2025 15:21:36 +0100 -Subject: [PATCH] incus/file/pull: Ensure we have a leading / in all paths -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Closes #1614 - -Signed-off-by: Stéphane Graber <[email protected]> ---- - cmd/incus/file.go | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/cmd/incus/file.go b/cmd/incus/file.go -index a17486ad327..99467a0bfc5 100644 ---- a/cmd/incus/file.go -+++ b/cmd/incus/file.go -@@ -575,6 +575,11 @@ func (c *cmdFilePull) Run(cmd *cobra.Command, args []string) error { - return fmt.Errorf(i18n.G("Invalid source %s"), resource.name) - } - -+ // Make sure we have a leading / for the path. -+ if !strings.HasPrefix(pathSpec[1], "/") { -+ pathSpec[1] = "/" + pathSpec[1] -+ } -+ - sftpConn, ok := sftpClients[pathSpec[0]] - if !ok { - sftpConn, err = resource.server.GetInstanceFileSFTP(pathSpec[0]) - 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 deleted file mode 100644 index 05c7b45c0e5d..000000000000 --- a/app-containers/incus/files/incus-6.9-read-files-in-chunks.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f2ef7aa808e204c8714de40b29895ea596e2bb0e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?St=C3=A9phane=20Graber?= <[email protected]> -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 <[email protected]> ---- - 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 -+ } - } - } -
