refactor: put source-channel always before source-branch

Signed-off-by: Dariusz Duda <[email protected]>
canonical · Jan 20, 2025 · d9c4180 · d9c4180
1 parent 5042a8b
commit d9c4180
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/craft_parts/state_manager/pull_state.py b/craft_parts/state_manager/pull_state.py
@@ -70,8 +70,8 @@ def properties_of_interest(
             "source-depth",
             "source-tag",
             "source-type",
-            "source-branch",
             "source-channel",
+            "source-branch",
             "source-subdir",
             "source-submodules",
             "override-pull",

diff --git a/tests/unit/features/overlay/test_parts.py b/tests/unit/features/overlay/test_parts.py
@@ -36,8 +36,8 @@ def test_marshal_unmarshal(self):
             "plugin": "nil",
             "source": "http://example.com/hello-2.3.tar.gz",
             "source-checksum": "md5/d9210476aac5f367b14e513bdefdee08",
-            "source-branch": "release",
             "source-channel": None,
+            "source-branch": "release",
             "source-commit": "2514f9533ec9b45d07883e10a561b248497a8e3c",
             "source-depth": 3,
             "source-subdir": "src",

diff --git a/tests/unit/state_manager/test_pull_state.py b/tests/unit/state_manager/test_pull_state.py
@@ -92,8 +92,8 @@ def test_property_changes(self, properties):
             "source-depth",
             "source-tag",
             "source-type",
-            "source-branch",
             "source-channel",
+            "source-branch",
             "source-subdir",
             "source-submodules",
             "override-pull",
@@ -126,8 +126,8 @@ def test_extra_property_changes(self, properties):
             "source-depth",
             "source-tag",
             "source-type",
-            "source-branch",
             "source-channel",
+            "source-branch",
             "source-subdir",
             "source-submodules",
             "override-pull",

diff --git a/tests/unit/test_parts.py b/tests/unit/test_parts.py
@@ -36,8 +36,8 @@ def test_marshal_unmarshal(self, partitions):
             "plugin": "nil",
             "source": "http://example.com/hello-2.3.tar.gz",
             "source-checksum": "md5/d9210476aac5f367b14e513bdefdee08",
-            "source-branch": "release",
             "source-channel": None,
+            "source-branch": "release",
             "source-commit": "2514f9533ec9b45d07883e10a561b248497a8e3c",
             "source-depth": 3,
             "source-subdir": "src",