From: Stéphane Graber <stgraber@ubuntu.com>
Date: Thu, 30 Jan 2014 17:25:21 +0000 (+0000)
Subject: lxc_info: Fix -H with -c
X-Git-Tag: lxc-1.0.0.beta4~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44fa8e7e9130c19e04c2fc47f712d06b357c7fab;p=thirdparty%2Flxc.git

lxc_info: Fix -H with -c

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/lxc_info.c b/src/lxc/lxc_info.c
index 7915c0e3e..4243cf3ec 100644
--- a/src/lxc/lxc_info.c
+++ b/src/lxc/lxc_info.c
@@ -338,11 +338,17 @@ static int print_info(const char *name, const char *lxcpath)
 			if (c->get_config_item(c, key[i], val, len + 1) != len) {
 				fprintf(stderr, "unable to read %s from configuration\n", key[i]);
 			} else {
-				printf("%s = %s\n", key[i], val);
+				if (!humanize && keys == 1)
+					printf("%s\n", val);
+				else
+					printf("%s = %s\n", key[i], val);
 			}
 			free(val);
 		} else if (len == 0) {
-			printf("%s =\n", key[i]);
+			if (!humanize && keys == 1)
+				printf("\n");
+			else
+				printf("%s =\n", key[i]);
 		} else {
 			fprintf(stderr, "%s invalid\n", key[i]);
 		}