Merge branch 'options-rewrite'

Conflicts:
	src/lib/Bcfg2/Client/Frame.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Admin/Init.py
	src/lib/Bcfg2/Server/Admin/Xcmd.py
	src/lib/Bcfg2/Server/BuiltinCore.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/MultiprocessingCore.py
	src/lib/Bcfg2/Server/Plugin/base.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
	src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
	src/lib/Bcfg2/Server/SSLServer.py
	src/lib/Bcfg2/Utils.py
	src/lib/Bcfg2/settings.py
	src/sbin/bcfg2-crypt
	src/sbin/bcfg2-info
	src/sbin/bcfg2-lint
	src/sbin/bcfg2-test
	src/sbin/bcfg2-yum-helper
	tools/bcfg2-profile-templates.py

1 files changed, 32 insertions, 0 deletions

diff --git a/tools/upgrade/1.4/convert_bundles.py b/tools/upgrade/1.4/convert_bundles.py
new file mode 100755
index 000000000..b9cb483f2
--- /dev/null
+++ b/tools/upgrade/1.4/convert_bundles.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+
+import os
+import sys
+import lxml.etree
+import Bcfg2.Options
+
+
+def main():
+    parser = Bcfg2.Options.get_parser("Tool to remove bundle names")
+    parser.add_options([Bcfg2.Options.Common.repository])
+    parser.parse()
+
+    bundler_dir = os.path.join(Bcfg2.Options.setup.repository, "Bundler")
+    if os.path.exists(bundler_dir):
+        for root, _, files in os.walk(bundler_dir):
+            for fname in files:
+                bpath = os.path.join(root, fname)
+                newpath = bpath
+                if newpath.endswith(".genshi"):
+                    newpath = newpath[:-6] + "xml"
+                    print("Converting %s to %s" % (bpath, newpath))
+                else:
+                    print("Converting %s" % bpath)
+                xroot = lxml.etree.parse(bpath)
+                xdata = xroot.getroot()
+                if 'name' in xdata.attrib:
+                    del xdata.attrib['name']
+                xroot.write(bpath)
+
+if __name__ == '__main__':
+    sys.exit(main())