aboutsummaryrefslogtreecommitdiff
path: root/cmd/podman/root.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-05-03 16:37:54 -0400
committerGitHub <noreply@github.com>2022-05-03 16:37:54 -0400
commit3210a3f4257d19744abd4ae2302018b16edb2507 (patch)
tree97f6f9e2c4bfd41191971c5658484012ce1b4826 /cmd/podman/root.go
parent3af1396f269463aa7640e9cf1dcc84a413d99ee0 (diff)
parent3ab8fa679c57a653f7ea012f79fa453ae8133108 (diff)
downloadpodman-3210a3f4257d19744abd4ae2302018b16edb2507.tar.gz
podman-3210a3f4257d19744abd4ae2302018b16edb2507.tar.bz2
podman-3210a3f4257d19744abd4ae2302018b16edb2507.zip
Merge pull request #14100 from mheon/incremental_backports
[v4.1] Incremental backports
Diffstat (limited to 'cmd/podman/root.go')
-rw-r--r--cmd/podman/root.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/cmd/podman/root.go b/cmd/podman/root.go
index 9b1aa778b..2bd4fa723 100644
--- a/cmd/podman/root.go
+++ b/cmd/podman/root.go
@@ -153,7 +153,9 @@ func persistentPreRunE(cmd *cobra.Command, args []string) error {
*runtime,
)
}
- runtimeFlag.Value.Set(*runtime)
+ if err := runtimeFlag.Value.Set(*runtime); err != nil {
+ return err
+ }
runtimeFlag.Changed = true
logrus.Debugf("Checkpoint was created using '%s'. Restore will use the same runtime", *runtime)
} else if cfg.RuntimePath != *runtime {