From fa7cde3683924eb0e1544ab2b56a80f14bba8893 Mon Sep 17 00:00:00 2001 From: Paul Mars Date: Tue, 24 Oct 2023 21:28:48 +0200 Subject: [PATCH] Fix pockets order --- internal/imagedefinition/README.rst | 4 ++-- internal/imagedefinition/image_definition.go | 9 +++------ internal/statemachine/classic_test.go | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/internal/imagedefinition/README.rst b/internal/imagedefinition/README.rst index 17e14c86..68a0f950 100644 --- a/internal/imagedefinition/README.rst +++ b/internal/imagedefinition/README.rst @@ -67,7 +67,7 @@ The following specification defines what is supported in the YAML: # archive-tasks, or tarball. rootfs: # Components are a list of apt sources, such as main, - # universe, and restricted. Defaults to "main". + # universe, and restricted. Defaults to "main,restricted". components: (optional) - - @@ -131,7 +131,7 @@ The following specification defines what is supported in the YAML: # This is only supported for classic image building customization: (optional) # Components are a list of apt sources, such as main, - # universe, and restricted. Defaults to "main". + # universe, and restricted. Defaults to "main, restricted, universe". # These are used in the resulting img, not to build it. components: (optional) - diff --git a/internal/imagedefinition/image_definition.go b/internal/imagedefinition/image_definition.go index 8418e9ad..f8e48e80 100644 --- a/internal/imagedefinition/image_definition.go +++ b/internal/imagedefinition/image_definition.go @@ -308,10 +308,7 @@ func (imageDef ImageDefinition) securityMirror() string { } func generatePocketList(series string, components []string, mirror string, securityMirror string, pocket string) []string { - baseList := fmt.Sprintf("deb %%s %s%%s %s\n", - series, - strings.Join(components, " "), - ) + baseList := fmt.Sprintf("deb %%s %s%%s %s\n", series, strings.Join(components, " ")) releaseList := fmt.Sprintf(baseList, mirror, "") securityList := fmt.Sprintf(baseList, securityMirror, "-security") @@ -326,9 +323,9 @@ func generatePocketList(series string, components []string, mirror string, secur case "security": pocketList = append(pocketList, releaseList, securityList) case "updates": - pocketList = append(pocketList, releaseList, updatesList, securityList) + pocketList = append(pocketList, releaseList, securityList, updatesList) case "proposed": - pocketList = append(pocketList, releaseList, updatesList, securityList, proposedList) + pocketList = append(pocketList, releaseList, securityList, updatesList, proposedList) } return pocketList diff --git a/internal/statemachine/classic_test.go b/internal/statemachine/classic_test.go index 4521cb2a..4e02c69b 100644 --- a/internal/statemachine/classic_test.go +++ b/internal/statemachine/classic_test.go @@ -3378,8 +3378,8 @@ func TestCreateChroot(t *testing.T) { asserter.AssertErrNil(err, true) pockets := []string{ - fmt.Sprintf("%s-updates", stateMachine.ImageDef.Series), fmt.Sprintf("%s-security", stateMachine.ImageDef.Series), + fmt.Sprintf("%s-updates", stateMachine.ImageDef.Series), fmt.Sprintf("%s-proposed", stateMachine.ImageDef.Series), }