opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-24 07:58:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix runtime check during restore

Browse Source 
cfg.RuntimePath was set to default runtime, so the empty string
check fails. Instead we could check if the flag was changed.

Signed-off-by: Zeyad Yasser <zeyady98@gmail.com>
This commit is contained in:
Zeyad Yasser
2022-06-23 21:53:58 +02:00
parent c66a489b75
commit 8e3a46a87b
1 changed files with 7 additions and 8 deletions

15
cmd/podman/root.go

@ -143,16 +143,15 @@ func persistentPreRunE(cmd *cobra.Command, args []string) error {
cmd.Flag("import").Value.String(), cmd.Flag("import").Value.String(),
) )
} }
if cfg.RuntimePath == "" {
runtimeFlag := cmd.Root().Flag("runtime")
if runtimeFlag == nil {
return errors.New("failed to load --runtime flag")
}
if !runtimeFlag.Changed {
// If the user did not select a runtime, this takes the one from // If the user did not select a runtime, this takes the one from
// the checkpoint archives and tells Podman to use it for the restore. // the checkpoint archives and tells Podman to use it for the restore.
runtimeFlag := cmd.Root().Flags().Lookup("runtime")
if runtimeFlag == nil {
return errors.Errorf(
"setting runtime to '%s' for restore",
*runtime,
)
}
if err := runtimeFlag.Value.Set(*runtime); err != nil { if err := runtimeFlag.Value.Set(*runtime); err != nil {
return err return err
} }