Fix missing install_package state in some cases

canonical · Oct 9, 2023 · 0e6e016 · 0e6e016
1 parent f47b371
commit 0e6e016
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/internal/statemachine/classic_states.go b/internal/statemachine/classic_states.go
@@ -258,15 +258,14 @@ func (stateMachine *StateMachine) calculateStates() error {
 		}
 	} else if classicStateMachine.ImageDef.Rootfs.Seed != nil {
 		rootfsCreationStates = append(rootfsCreationStates, rootfsSeedStates...)
-		if classicStateMachine.ImageDef.Customization != nil {
-			if len(classicStateMachine.ImageDef.Customization.ExtraPPAs) > 0 {
-				rootfsCreationStates = append(rootfsCreationStates,
-					[]stateFunc{
-						{"add_extra_ppas", (*StateMachine).addExtraPPAs},
-						{"install_packages", (*StateMachine).installPackages},
-						{"clean_extra_ppas", (*StateMachine).cleanExtraPPAs},
-					}...)
-			}
+		if classicStateMachine.ImageDef.Customization != nil && len(classicStateMachine.ImageDef.Customization.ExtraPPAs) > 0 {
+			rootfsCreationStates = append(rootfsCreationStates,
+				[]stateFunc{
+					{"add_extra_ppas", (*StateMachine).addExtraPPAs},
+					{"install_packages", (*StateMachine).installPackages},
+					{"clean_extra_ppas", (*StateMachine).cleanExtraPPAs},
+				}...)
+
 		} else {
 			rootfsCreationStates = append(rootfsCreationStates,
 				stateFunc{"install_packages", (*StateMachine).installPackages},