From e57b12e75a4d5d713a4cb746e449ddeacabaa960 Mon Sep 17 00:00:00 2001 From: Roopa Prabhu Date: Fri, 10 Oct 2014 14:52:11 -0700 Subject: [PATCH] Replace check mark by none and cross mark by ascii 'x' in --check output Ticket: CM-3810 Reviewed By: Testing Done: These are configurable via strings check_success_str and check_error_str in /etc/network/ifupdown2/ifupdown2.conf --- ifupdown/iface.py | 8 ++++---- ifupdown/ifupdownmain.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ifupdown/iface.py b/ifupdown/iface.py index 07b753b..0f71ec7 100644 --- a/ifupdown/iface.py +++ b/ifupdown/iface.py @@ -436,9 +436,9 @@ class iface(): if with_status: if (self.status == ifaceStatus.NOTFOUND or self.status == ifaceStatus.ERROR): - outbuf += ' (%s)' %errorstr + outbuf += ' %s' %errorstr elif self.status == ifaceStatus.SUCCESS: - outbuf += ' (%s)' %successstr + outbuf += ' %s' %successstr if self.status == ifaceStatus.NOTFOUND: if with_status: outbuf = (outbuf.encode('utf8') @@ -455,10 +455,10 @@ class iface(): if with_status: s = self.get_config_attr_status(cname, idx) if s: - outbuf += (indent + '%s %s (%s)\n' + outbuf += (indent + '%s %s %s\n' %(cname, cv, errorstr)) elif s == 0: - outbuf += (indent + '%s %s (%s)\n' + outbuf += (indent + '%s %s %s\n' %(cname, cv, successstr)) else: outbuf += indent + '%s %s\n' %(cname, cv) diff --git a/ifupdown/ifupdownmain.py b/ifupdown/ifupdownmain.py index 392b75c..3d709e0 100644 --- a/ifupdown/ifupdownmain.py +++ b/ifupdown/ifupdownmain.py @@ -34,8 +34,8 @@ from sets import Set _tickmark = u'\u2713' _crossmark = u'\u2717' -_success_sym = _tickmark -_error_sym = _crossmark +_success_sym = '' +_error_sym = '(x)' class ifupdownMain(ifupdownBase): """ ifupdown2 main class """