[lxc-devel] [lxc/master] lxc-destroy: avoid double print
brauner on Github
lxc-bot at linuxcontainers.org
Mon Apr 11 22:03:08 UTC 2016
A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 364 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20160411/b8b784a9/attachment.bin>
-------------- next part --------------
From 446ca810914bdc74a9d3f39d88f580d025b36d5e Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at mailbox.org>
Date: Mon, 11 Apr 2016 23:57:29 +0200
Subject: [PATCH] lxc-destroy: avoid double print
Signed-off-by: Christian Brauner <christian.brauner at mailbox.org>
---
src/lxc/lxc_destroy.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/lxc/lxc_destroy.c b/src/lxc/lxc_destroy.c
index c6e3454..b521739 100644
--- a/src/lxc/lxc_destroy.c
+++ b/src/lxc/lxc_destroy.c
@@ -18,16 +18,18 @@
*/
#define _GNU_SOURCE
-#include <lxc/lxccontainer.h>
+#include "config.h"
-#include <stdio.h>
#include <libgen.h>
+#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
-#include "lxc.h"
-#include "log.h"
+#include <lxc/lxccontainer.h>
+
#include "arguments.h"
+#include "log.h"
+#include "lxc.h"
#include "utils.h"
lxc_log_define(lxc_destroy_ui, lxc);
@@ -251,9 +253,6 @@ static bool do_destroy_with_snapshots(struct lxc_container *c)
else
bret = do_destroy(c);
- if (bret && !quiet)
- printf("Destroyed container %s including snapshots \n", my_args.name);
-
return bret;
}
More information about the lxc-devel
mailing list