[lxc-devel] [lxc/master] lxc-copy: correct order of copy and original

[brauner on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 594 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20160301/fc746656/attachment.bin>
-------------- next part --------------
From 5a8929b12cbff1f0d6e340ec33e1721c2f7b7152 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at mailbox.org>
Date: Tue, 1 Mar 2016 21:50:55 +0100
Subject: [PATCH] lxc-copy: correct order of copy and original

	lxc-copy -n ORIG -N COPY -e

accidently printed

	"Created ORIG as clone of COPY"

instead of

	"Created COPY as clone of ORIG".
Fix the ordering.

Signed-off-by: Christian Brauner <christian.brauner at mailbox.org>
---
 src/lxc/lxc_copy.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/lxc/lxc_copy.c b/src/lxc/lxc_copy.c
index 155a588..003e8a1 100644
--- a/src/lxc/lxc_copy.c
+++ b/src/lxc/lxc_copy.c
@@ -358,8 +358,7 @@ static int do_clone(struct lxc_container *c, char *newname, char *newpath,
 		return -1;
 	}
 
-	INFO("Created container %s as %s of %s\n", newname,
-	     task ? "snapshot" : "copy", c->name);
+	INFO("Created %s as %s of %s\n", newname, task ? "snapshot" : "copy", c->name);
 
 	lxc_container_put(clone);
 
@@ -421,7 +420,7 @@ static int do_clone_ephemeral(struct lxc_container *c,
 		goto destroy_and_put;
 
 	if (!my_args.quiet)
-		printf("Created %s as %s of %s\n", arg->name, "clone", arg->newname);
+		printf("Created %s as clone of %s\n", arg->newname, arg->name);
 
 	if (!arg->daemonize && arg->argc) {
 		clone->want_daemonize(clone, true);