mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code

Fix print methods to not follow dependents when -a is set (-a already

Browse Source 
covers all dependents)

Ticket: CM-2505
Reviewed By:
Testing Done: Tested ifquery
This commit is contained in:
roopa
2014-03-29 14:51:37 -07:00
parent 9dce35612d
commit 339026c894
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/ifupdownmain.py
View File

@ -865,7 +865,7 @@ class ifupdownMain(ifupdownBase):
continue continue
ifaceobj.dump_raw(self.logger) ifaceobj.dump_raw(self.logger)
print '\n' print '\n'
if self.WITH_DEPENDS: if self.WITH_DEPENDS and not self.ALL:
dlist = ifaceobj.lowerifaces dlist = ifaceobj.lowerifaces
if not dlist: continue if not dlist: continue
self.print_ifaceobjs_raw(dlist) self.print_ifaceobjs_raw(dlist)
@ -881,7 +881,7 @@ class ifupdownMain(ifupdownBase):
ifaceobj.dump_json() ifaceobj.dump_json()
else: else:
ifaceobj.dump_pretty() ifaceobj.dump_pretty()
if self.WITH_DEPENDS: if self.WITH_DEPENDS and not self.ALL:
dlist = ifaceobj.lowerifaces dlist = ifaceobj.lowerifaces
if not dlist: continue if not dlist: continue
self.print_ifaceobjs_pretty(dlist, format) self.print_ifaceobjs_pretty(dlist, format)
@ -910,7 +910,7 @@ class ifupdownMain(ifupdownBase):
ifaceobj.dump_json(with_status=True) ifaceobj.dump_json(with_status=True)
else: else:
ifaceobj.dump_pretty(with_status=True) ifaceobj.dump_pretty(with_status=True)
if self.WITH_DEPENDS: if self.WITH_DEPENDS and not self.ALL:
dlist = ifaceobj.lowerifaces dlist = ifaceobj.lowerifaces
if not dlist: continue if not dlist: continue
self.print_ifaceobjscurr_pretty(dlist, format) self.print_ifaceobjscurr_pretty(dlist, format)
@ -930,7 +930,7 @@ class ifupdownMain(ifupdownBase):
ifaceobj.dump_json() ifaceobj.dump_json()
else: else:
ifaceobj.dump_pretty() ifaceobj.dump_pretty()
if self.WITH_DEPENDS: if self.WITH_DEPENDS and not self.ALL:
dlist = ifaceobj.lowerifaces dlist = ifaceobj.lowerifaces
if not dlist: continue if not dlist: continue
self.print_ifaceobjsrunning_pretty(dlist, format) self.print_ifaceobjsrunning_pretty(dlist, format)