From 52824a1cf8786c318269f71f0cc7c234d4a92f73 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 28 Mar 2013 10:22:53 -0400 Subject: bcfg2_local.py: remove duplicate -Q options --- tools/bcfg2_local.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tools') diff --git a/tools/bcfg2_local.py b/tools/bcfg2_local.py index 2b9d39342..70e8fc0b2 100755 --- a/tools/bcfg2_local.py +++ b/tools/bcfg2_local.py @@ -64,6 +64,11 @@ 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. + del optinfo['bundle_quick'] setup = Bcfg2.Options.OptionParser(optinfo) setup.parse(sys.argv[1:]) -- cgit v1.2.3-1-g7c22 From e59ffe8f211e7bf2314402b96b44e0e72021c15f Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 2 Apr 2013 14:19:09 -0400 Subject: fix bogus bundle_quick option handling in bcfg2_local.py --- tools/bcfg2_local.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/bcfg2_local.py b/tools/bcfg2_local.py index 70e8fc0b2..edb5a7101 100755 --- a/tools/bcfg2_local.py +++ b/tools/bcfg2_local.py @@ -68,7 +68,8 @@ def main(): # CLIENT_BUNDLEQUICK option uses -Q, just like the server repo # option. the server repo is more important for this # application. - del optinfo['bundle_quick'] + optinfo['bundle_quick'] = Bcfg2.Options.Option('bundlequick', + default=False) setup = Bcfg2.Options.OptionParser(optinfo) setup.parse(sys.argv[1:]) -- cgit v1.2.3-1-g7c22 From 21aaa0db5a408a83f874816f7d7c3ebfb0d4d6fe Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Thu, 4 Apr 2013 14:51:57 -0500 Subject: selinux: Fix selinux_baseline.py Signed-off-by: Sol Jerome --- tools/selinux_baseline.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') 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)) -- cgit v1.2.3-1-g7c22 From cc6df36fbefe3ab6c3a218c0a95fd66ee47f68aa Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 16 Apr 2013 16:19:51 -0400 Subject: tools: write all changed files when migrating perms to mode --- tools/upgrade/1.3/migrate_perms_to_mode.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tools') 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) -- cgit v1.2.3-1-g7c22