Merge branch 'maint'

Conflicts:
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Frame.py
	src/lib/Bcfg2/Client/Tools/YUM.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Admin/Perf.py
	src/lib/Bcfg2/Server/Admin/Xcmd.py
	src/lib/Bcfg2/Server/Admin/__init__.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/FileMonitor/Fam.py
	src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Base.py
	src/lib/Bcfg2/Server/Plugins/Bundler.py
	src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py
	src/lib/Bcfg2/Server/Plugins/Cvs.py
	src/lib/Bcfg2/Server/Plugins/Darcs.py
	src/lib/Bcfg2/Server/Plugins/Decisions.py
	src/lib/Bcfg2/Server/Plugins/FileProbes.py
	src/lib/Bcfg2/Server/Plugins/Fossil.py
	src/lib/Bcfg2/Server/Plugins/Git.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/Plugins/NagiosGen.py
	src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
	src/lib/Bcfg2/Server/Plugins/Packages/Source.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
	src/lib/Bcfg2/Server/Plugins/Properties.py
	src/lib/Bcfg2/Server/Plugins/__init__.py
	src/lib/Bcfg2/Server/__init__.py
	src/sbin/bcfg2-build-reports
	src/sbin/bcfg2-crypt
	testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py

3 files changed, 10 insertions, 3 deletions

diff --git a/tools/bcfg2_local.py b/tools/bcfg2_local.py
index 2b9d39342..edb5a7101 100755
--- a/tools/bcfg2_local.py
+++ b/tools/bcfg2_local.py
@@ -64,6 +64,12 @@ class LocalClient(Client):
 def main():
     optinfo = Bcfg2.Options.CLIENT_COMMON_OPTIONS
     optinfo.update(Bcfg2.Options.SERVER_COMMON_OPTIONS)
+    if 'bundle_quick' in optinfo:
+        # CLIENT_BUNDLEQUICK option uses -Q, just like the server repo
+        # option.  the server repo is more important for this
+        # application.
+        optinfo['bundle_quick'] = Bcfg2.Options.Option('bundlequick',
+                                                       default=False)
     setup = Bcfg2.Options.OptionParser(optinfo)
     setup.parse(sys.argv[1:])
 
diff --git a/tools/selinux_baseline.py b/tools/selinux_baseline.py
index b6997bb29..06f6e6b98 100755
--- a/tools/selinux_baseline.py
+++ b/tools/selinux_baseline.py
@@ -42,7 +42,7 @@ def main():
         baseline.append(lxml.etree.Comment("%s entries" % etype))
         extra = handler.FindExtra()
         for entry in extra:
-            entry.tag = "BoundSELinux"
+            entry.tag = "Bound%s" % etype
         baseline.extend(extra)
 
     print(lxml.etree.tostring(baseline, pretty_print=True))
diff --git a/tools/upgrade/1.3/migrate_perms_to_mode.py b/tools/upgrade/1.3/migrate_perms_to_mode.py
index e061558d3..18abffec2 100755
--- a/tools/upgrade/1.3/migrate_perms_to_mode.py
+++ b/tools/upgrade/1.3/migrate_perms_to_mode.py
@@ -13,6 +13,7 @@ def setmodeattr(elem):
         elem.set('mode', elem.get('perms'))
         del elem.attrib['perms']
         return True
+    return False
 
 
 def writefile(f, xdata):
@@ -32,7 +33,7 @@ def convertinfo(ifile):
         return
     found = False
     for i in xdata.findall('//Info'):
-        found = setmodeattr(i)
+        found |= setmodeattr(i)
     if found:
         writefile(ifile, xdata)
 
@@ -47,7 +48,7 @@ def convertstructure(structfile):
         return
     found = False
     for path in xdata.xpath('//BoundPath|//Path'):
-        found = setmodeattr(path)
+        found |= setmodeattr(path)
     if found:
         writefile(structfile, xdata)