From 339026c894b1720d95a79aeb1cacaf9a459bdbdd Mon Sep 17 00:00:00 2001 From: roopa Date: Sat, 29 Mar 2014 14:51:37 -0700 Subject: [PATCH] Fix print methods to not follow dependents when -a is set (-a already covers all dependents) Ticket: CM-2505 Reviewed By: Testing Done: Tested ifquery --- pkg/ifupdownmain.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/ifupdownmain.py b/pkg/ifupdownmain.py index 4140a19..3bd825c 100644 --- a/pkg/ifupdownmain.py +++ b/pkg/ifupdownmain.py @@ -865,7 +865,7 @@ class ifupdownMain(ifupdownBase): continue ifaceobj.dump_raw(self.logger) print '\n' - if self.WITH_DEPENDS: + if self.WITH_DEPENDS and not self.ALL: dlist = ifaceobj.lowerifaces if not dlist: continue self.print_ifaceobjs_raw(dlist) @@ -881,7 +881,7 @@ class ifupdownMain(ifupdownBase): ifaceobj.dump_json() else: ifaceobj.dump_pretty() - if self.WITH_DEPENDS: + if self.WITH_DEPENDS and not self.ALL: dlist = ifaceobj.lowerifaces if not dlist: continue self.print_ifaceobjs_pretty(dlist, format) @@ -910,7 +910,7 @@ class ifupdownMain(ifupdownBase): ifaceobj.dump_json(with_status=True) else: ifaceobj.dump_pretty(with_status=True) - if self.WITH_DEPENDS: + if self.WITH_DEPENDS and not self.ALL: dlist = ifaceobj.lowerifaces if not dlist: continue self.print_ifaceobjscurr_pretty(dlist, format) @@ -930,7 +930,7 @@ class ifupdownMain(ifupdownBase): ifaceobj.dump_json() else: ifaceobj.dump_pretty() - if self.WITH_DEPENDS: + if self.WITH_DEPENDS and not self.ALL: dlist = ifaceobj.lowerifaces if not dlist: continue self.print_ifaceobjsrunning_pretty(dlist, format)