From 8944ddd56a6e20756cd869123400b7a57c4a2e40 Mon Sep 17 00:00:00 2001
From: James Falcon <james.falcon@canonical.com>
Date: Tue, 6 Aug 2024 12:36:15 -0500
Subject: [PATCH] refresh patches

---
 ...retain-file-argument-as-main-cmd-arg.patch | 21 +++++++++----------
 ...560d-cloud-config-after-snap-seeding.patch |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/debian/patches/cli-retain-file-argument-as-main-cmd-arg.patch b/debian/patches/cli-retain-file-argument-as-main-cmd-arg.patch
index 98a3f1cd6aa..62ae666bec4 100644
--- a/debian/patches/cli-retain-file-argument-as-main-cmd-arg.patch
+++ b/debian/patches/cli-retain-file-argument-as-main-cmd-arg.patch
@@ -9,7 +9,7 @@ Bug: https://bugs.launchpad.net/ubuntu/+source/cloud-init/+bug/2064300
 Last-Update: 2024-04-30 <YYYY-MM-DD, last update of the meta-information, optional>
 --- a/cloudinit/cmd/main.py
 +++ b/cloudinit/cmd/main.py
-@@ -121,6 +121,11 @@ def extract_fns(args):
+@@ -147,6 +147,11 @@ def extract_fns(args):
      # since it would of broke if it couldn't have
      # read that file already...
      fn_cfgs = []
@@ -21,7 +21,7 @@ Last-Update: 2024-04-30 <YYYY-MM-DD, last update of the meta-information, option
      if args.files:
          for fh in args.files:
              # The realpath is more useful in logging
-@@ -922,6 +927,17 @@ def main(sysv_args=None):
+@@ -953,6 +958,17 @@ def main(sysv_args=None):
          default=False,
      )
      parser.add_argument(
@@ -41,18 +41,17 @@ Last-Update: 2024-04-30 <YYYY-MM-DD, last update of the meta-information, option
          help=(
 --- a/tests/unittests/cmd/test_main.py
 +++ b/tests/unittests/cmd/test_main.py
-@@ -13,7 +13,9 @@ from cloudinit.cmd import main
- from cloudinit.util import ensure_dir, load_text_file, write_file
+@@ -14,7 +14,8 @@ from cloudinit.util import ensure_dir, l
  from tests.unittests.helpers import FilesystemMockingTestCase, wrap_and_call
  
--MyArgs = namedtuple("MyArgs", "debug files force local reporter subcommand")
-+MyArgs = namedtuple(
-+    "MyArgs", "debug main_files files force local reporter subcommand"
-+)
+ MyArgs = namedtuple(
+-    "MyArgs", "debug files force local reporter subcommand skip_log_setup"
++    "MyArgs",
++    "debug main_files files force local reporter subcommand skip_log_setup",
+ )
  
  
- class TestMain(FilesystemMockingTestCase):
-@@ -71,6 +73,7 @@ class TestMain(FilesystemMockingTestCase
+@@ -73,6 +74,7 @@ class TestMain(FilesystemMockingTestCase
          """Modules like write_files are run in 'net' mode."""
          cmdargs = MyArgs(
              debug=False,
@@ -60,7 +59,7 @@ Last-Update: 2024-04-30 <YYYY-MM-DD, last update of the meta-information, option
              files=None,
              force=False,
              local=False,
-@@ -117,6 +120,7 @@ class TestMain(FilesystemMockingTestCase
+@@ -120,6 +122,7 @@ class TestMain(FilesystemMockingTestCase
          write_file(self.cloud_cfg_file, cloud_cfg)
          cmdargs = MyArgs(
              debug=False,
diff --git a/debian/patches/revert-551f560d-cloud-config-after-snap-seeding.patch b/debian/patches/revert-551f560d-cloud-config-after-snap-seeding.patch
index a338d91f217..7a699dc12fa 100644
--- a/debian/patches/revert-551f560d-cloud-config-after-snap-seeding.patch
+++ b/debian/patches/revert-551f560d-cloud-config-after-snap-seeding.patch
@@ -67,7 +67,7 @@ Last-Update: 2024-02-14
  
  if TYPE_CHECKING:
      # Avoid circular import
-@@ -3064,18 +3064,6 @@ def wait_for_files(flist, maxwait, naple
+@@ -3087,18 +3087,6 @@ def wait_for_files(flist, maxwait, naple
      return need