Skip to content

Commit ddb1130

Browse files
Fix stacks and pgkmanagers remove question loop
1 parent 9433933 commit ddb1130

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

cmd/pkgManagers.go

+6-3
Original file line numberDiff line numberDiff line change
@@ -419,17 +419,20 @@ func rmPkgManager(cmd *cobra.Command, args []string) error {
419419
switch answer {
420420
case "y\n":
421421
validChoice = true
422+
force = true
422423
case "n\n":
423424
validChoice = true
424-
cmdr.Info.Println(apx.Trans("pkgmanagers.rm.info.aborting"))
425-
return nil
426425
default:
427426
cmdr.Info.Println(apx.Trans("apx.errors.invalidChoice"))
428-
return nil
429427
}
430428
}
431429
}
432430

431+
if !force {
432+
cmdr.Info.Println(apx.Trans("pkgmanagers.rm.info.aborting"))
433+
return nil
434+
}
435+
433436
error = pkgManager.Remove()
434437
if error != nil {
435438
return error

cmd/stacks.go

+6-3
Original file line numberDiff line numberDiff line change
@@ -501,17 +501,20 @@ func removeStack(cmd *cobra.Command, args []string) error {
501501
switch answer {
502502
case "y\n":
503503
validChoice = true
504+
force = true
504505
case "n\n":
505506
validChoice = true
506-
cmdr.Info.Println(apx.Trans("stacks.rm.info.aborting"))
507-
return nil
508507
default:
509508
cmdr.Info.Println(apx.Trans("apx.errors.invalidChoice"))
510-
return nil
511509
}
512510
}
513511
}
514512

513+
if !force {
514+
cmdr.Info.Println(apx.Trans("pkgmanagers.rm.info.aborting"))
515+
return nil
516+
}
517+
515518
stack, error := core.LoadStack(stackName)
516519
if error != nil {
517520
return error

0 commit comments

Comments
 (0)