From 8a909207d3bbac898b1cdef21946cf6b70a70f51 Mon Sep 17 00:00:00 2001 From: Jason Kincl Date: Wed, 29 May 2013 00:03:23 -0400 Subject: Comments: Fix lint check so that it only runs if using clients.xml --- src/lib/Bcfg2/Server/Lint/Comments.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/lib/Bcfg2/Server/Lint') diff --git a/src/lib/Bcfg2/Server/Lint/Comments.py b/src/lib/Bcfg2/Server/Lint/Comments.py index 7c3b2d9cc..080d0b821 100644 --- a/src/lib/Bcfg2/Server/Lint/Comments.py +++ b/src/lib/Bcfg2/Server/Lint/Comments.py @@ -144,9 +144,10 @@ class Comments(Bcfg2.Server.Lint.ServerPlugin): self.metadata.groups_xml.data, "metadata") if self.has_all_xincludes("clients.xml"): - self.check_xml(os.path.join(self.metadata.data, "clients.xml"), - self.metadata.clients_xml.data, - "metadata") + if hasattr(self.metadata, "clients_xml"): + self.check_xml(os.path.join(self.metadata.data, "clients.xml"), + self.metadata.clients_xml.data, + "metadata") def check_cfg(self): """ Check Cfg files and ``info.xml`` files for required -- cgit v1.2.3-1-g7c22 From 51d781db3ee335bc15581c62ee90fd71ab2bdd53 Mon Sep 17 00:00:00 2001 From: Jason Kincl Date: Wed, 29 May 2013 07:17:51 -0400 Subject: Changing order of logic --- src/lib/Bcfg2/Server/Lint/Comments.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/Bcfg2/Server/Lint') diff --git a/src/lib/Bcfg2/Server/Lint/Comments.py b/src/lib/Bcfg2/Server/Lint/Comments.py index 080d0b821..f028e225e 100644 --- a/src/lib/Bcfg2/Server/Lint/Comments.py +++ b/src/lib/Bcfg2/Server/Lint/Comments.py @@ -143,8 +143,8 @@ class Comments(Bcfg2.Server.Lint.ServerPlugin): self.check_xml(os.path.join(self.metadata.data, "groups.xml"), self.metadata.groups_xml.data, "metadata") - if self.has_all_xincludes("clients.xml"): - if hasattr(self.metadata, "clients_xml"): + if hasattr(self.metadata, "clients_xml"): + if self.has_all_xincludes("clients.xml"): self.check_xml(os.path.join(self.metadata.data, "clients.xml"), self.metadata.clients_xml.data, "metadata") -- cgit v1.2.3-1-g7c22