summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2010-05-17 23:08:42 +0000
committerSol Jerome <solj@ices.utexas.edu>2010-05-17 18:09:06 -0500
commit425b15dcdb7a7ba8c1a4960c7623643af40a3ccb (patch)
tree5b34e1426f532e40f549b75de7596c52ac46ff5d
parentdaf6eb01a78d5309d21c7ca223bd17b847ccc074 (diff)
downloadbcfg2-425b15dcdb7a7ba8c1a4960c7623643af40a3ccb.tar.gz
bcfg2-425b15dcdb7a7ba8c1a4960c7623643af40a3ccb.tar.bz2
bcfg2-425b15dcdb7a7ba8c1a4960c7623643af40a3ccb.zip
posixunified: Add support for subversion-backed repos (Patch from Tim Laszlo)
Signed-off-by: Sol Jerome <solj@ices.utexas.edu> git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5857 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--tools/posixunified.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/posixunified.py b/tools/posixunified.py
index 1129de055..8eb4ed734 100644
--- a/tools/posixunified.py
+++ b/tools/posixunified.py
@@ -28,6 +28,8 @@ if __name__ == '__main__':
for plug in ['Base', 'Bundler']:
for root, dirs, files in os.walk('%s/%s' % (repo, plug)):
+ if '.svn' in dirs:
+ dirs.remove('.svn')
for filename in files:
if filename.startswith('new'):
continue
@@ -106,8 +108,8 @@ if __name__ == '__main__':
try:
newrules = open(unifiedposixrules, 'w')
+ rulesroot.set('priority', '1')
+ newrules.write(lxml.etree.tostring(rulesroot, pretty_print=True))
+ newrules.close()
except IOError:
- print("Failed to write %s" % filename)
- rulesroot.set('priority', '1')
- newrules.write(lxml.etree.tostring(rulesroot, pretty_print=True))
- newrules.close()
+ print("Failed to write %s" % unifiedposixrules)