summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2010-09-13 18:04:51 +0000
committerSol Jerome <sol.jerome@gmail.com>2010-09-13 13:05:29 -0500
commit85f12bd9221b92730ef72f9cc233f2f1115d7a93 (patch)
treed2f9c46c6b25e2be847e5dd3cdfd6d963b402b5d
parent13967e09623bd517a614a2525d8ba7b60eef237e (diff)
downloadbcfg2-85f12bd9221b92730ef72f9cc233f2f1115d7a93.tar.gz
bcfg2-85f12bd9221b92730ef72f9cc233f2f1115d7a93.tar.bz2
bcfg2-85f12bd9221b92730ef72f9cc233f2f1115d7a93.zip
bcfg2-repo-validate: Patch from Joe Digilio to fix tb in Ticket #939
Signed-off-by: Sol Jerome <sol.jerome@gmail.com> git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@6055 ce84e21b-d406-0410-9b95-82705330c041
-rwxr-xr-xsrc/sbin/bcfg2-repo-validate3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/sbin/bcfg2-repo-validate b/src/sbin/bcfg2-repo-validate
index 1c03a7c2b..5e22dcf75 100755
--- a/src/sbin/bcfg2-repo-validate
+++ b/src/sbin/bcfg2-repo-validate
@@ -130,12 +130,13 @@ if __name__ == '__main__':
for pkg in xdata.findall("//Package"):
if pkg.getparent().tag == 'Group':
grp = pkg.getparent().get('name')
- if grp.getparent().tag == 'Group':
+ if type(grp) is not str and grp.getparent().tag == 'Group':
pgrp = grp.getparent().get('name')
else:
pgrp = 'none'
else:
grp = 'none'
+ pgrp = 'none'
ptuple = (pkg.get('name'), priority, ptype, grp, pgrp)
# check if package is already listed with same priority,
# type, grp