The following pull request was submitted through Github. It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/3571
This e-mail was sent by the LXC bot, direct replies will not reach the author unless they happen to be subscribed to this list. === Description (from pull-request) ===
From 51654d115926b6b58dcdac88f990f8d872b7da3f Mon Sep 17 00:00:00 2001 From: Alberto Donato <[email protected]> Date: Wed, 19 Jul 2017 11:20:34 +0200 Subject: [PATCH] Change compression_algorithm to compressionAlgorithm Signed-off-by: Alberto Donato <[email protected]> --- client.go | 6 +++--- lxc/publish.go | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client.go b/client.go index 174540ebe..db0321ad4 100644 --- a/client.go +++ b/client.go @@ -2747,7 +2747,7 @@ func (c *Client) AsyncWaitMeta(resp *api.Response) (map[string]interface{}, erro return op.Metadata, nil } -func (c *Client) ImageFromContainer(cname string, public bool, aliases []string, properties map[string]string, compression_algorithm string) (string, error) { +func (c *Client) ImageFromContainer(cname string, public bool, aliases []string, properties map[string]string, compressionAlgorithm string) (string, error) { if c.Remote.Public { return "", fmt.Errorf("This function isn't supported by public remotes.") } @@ -2758,8 +2758,8 @@ func (c *Client) ImageFromContainer(cname string, public bool, aliases []string, body := shared.Jmap{"public": public, "source": source, "properties": properties} - if compression_algorithm != "" { - body["compression_algorithm"] = compression_algorithm + if compressionAlgorithm != "" { + body["compression_algorithm"] = compressionAlgorithm } resp, err := c.post("images", body, api.AsyncResponse) diff --git a/lxc/publish.go b/lxc/publish.go index 2d4a9e121..8f769e298 100644 --- a/lxc/publish.go +++ b/lxc/publish.go @@ -14,10 +14,10 @@ import ( ) type publishCmd struct { - pAliases aliasList // aliasList defined in lxc/image.go - compression_algorithm string - makePublic bool - Force bool + pAliases aliasList // aliasList defined in lxc/image.go + compressionAlgorithm string + makePublic bool + Force bool } func (c *publishCmd) showByDefault() bool { @@ -36,7 +36,7 @@ func (c *publishCmd) flags() { gnuflag.Var(&c.pAliases, "alias", i18n.G("New alias to define at target")) gnuflag.BoolVar(&c.Force, "force", false, i18n.G("Stop the container if currently running")) gnuflag.BoolVar(&c.Force, "f", false, i18n.G("Stop the container if currently running")) - gnuflag.StringVar(&c.compression_algorithm, "compression", "", i18n.G("Define a compression algorithm: for image or none")) + gnuflag.StringVar(&c.compressionAlgorithm, "compression", "", i18n.G("Define a compression algorithm: for image or none")) } func (c *publishCmd) run(conf *config.Config, args []string) error { @@ -191,7 +191,7 @@ func (c *publishCmd) run(conf *config.Config, args []string) error { Type: "container", Name: cName, }, - CompressionAlgorithm: c.compression_algorithm, + CompressionAlgorithm: c.compressionAlgorithm, } req.Properties = properties
_______________________________________________ lxc-devel mailing list [email protected] http://lists.linuxcontainers.org/listinfo/lxc-devel
