From 39f1d44ec8af2f5987b9de74eea0bee225f7da65 Mon Sep 17 00:00:00 2001 From: Francesco Giudici Date: Tue, 10 Jan 2017 14:23:04 +0100 Subject: [PATCH] nmcli: output just the raw value of vlan.flags when in terse mode --- clients/cli/settings.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 396d6dbd61..d2d94913e4 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -900,10 +900,13 @@ bytes_to_string (GBytes *bytes) } static char * -vlan_flags_to_string (guint32 flags) +vlan_flags_to_string (guint32 flags, NmcPropertyGetType get_type) { GString *flag_str; + if (get_type == NMC_PROPERTY_GET_PARSABLE) + return g_strdup_printf ("%u", flags); + if (flags == 0) return g_strdup (_("0 (NONE)")); @@ -4724,7 +4727,7 @@ static char * nmc_property_vlan_get_flags (NMSetting *setting, NmcPropertyGetType get_type) { NMSettingVlan *s_vlan = NM_SETTING_VLAN (setting); - return vlan_flags_to_string (nm_setting_vlan_get_flags (s_vlan)); + return vlan_flags_to_string (nm_setting_vlan_get_flags (s_vlan), get_type); } static char *