mirror of
https://github.com/containers/podman.git
synced 2025-06-24 03:08:13 +08:00
Aliases do not work with IsSet
Have to specify all names. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #933 Approved by: baude
This commit is contained in:

committed by
Atomic Bot

parent
9b72746f9a
commit
ab72130650
@ -79,7 +79,7 @@ func commitCmd(c *cli.Context) error {
|
||||
switch c.String("format") {
|
||||
case "oci":
|
||||
mimeType = buildah.OCIv1ImageManifest
|
||||
if c.IsSet("message") {
|
||||
if c.IsSet("message") || c.IsSet("m") {
|
||||
return errors.Errorf("messages are only compatible with the docker image format (-f docker)")
|
||||
}
|
||||
case "docker":
|
||||
@ -89,7 +89,7 @@ func commitCmd(c *cli.Context) error {
|
||||
}
|
||||
container := args[0]
|
||||
reference := args[1]
|
||||
if c.IsSet("change") {
|
||||
if c.IsSet("change") || c.IsSet("c") {
|
||||
for _, change := range c.StringSlice("change") {
|
||||
splitChange := strings.Split(strings.ToUpper(change), "=")
|
||||
if !util.StringInSlice(splitChange[0], libpod.ChangeCmds) {
|
||||
|
@ -401,7 +401,7 @@ func parseCreateOpts(ctx context.Context, c *cli.Context, runtime *libpod.Runtim
|
||||
|
||||
// WORKING DIRECTORY
|
||||
workDir := "/"
|
||||
if c.IsSet("workdir") {
|
||||
if c.IsSet("workdir") || c.IsSet("w") {
|
||||
workDir = c.String("workdir")
|
||||
} else if data.ContainerConfig.WorkingDir != "" {
|
||||
workDir = data.ContainerConfig.WorkingDir
|
||||
|
@ -80,7 +80,7 @@ func importCmd(c *cli.Context) error {
|
||||
}
|
||||
|
||||
changes := v1.ImageConfig{}
|
||||
if c.IsSet("change") {
|
||||
if c.IsSet("change") || c.IsSet("c") {
|
||||
changes, err = util.GetImageConfig(c.StringSlice("change"))
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "error adding config changes to image %q", source)
|
||||
|
@ -173,7 +173,7 @@ func runCmd(c *cli.Context) error {
|
||||
}
|
||||
|
||||
// If attach is set, clear stdin/stdout/stderr and only attach requested
|
||||
if c.IsSet("attach") {
|
||||
if c.IsSet("attach") || c.IsSet("a") {
|
||||
outputStream = nil
|
||||
errorStream = nil
|
||||
inputStream = nil
|
||||
|
Reference in New Issue
Block a user