From 762baa81c1be1829ddc341410d36685aca46d095 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Sat, 27 Jul 2013 18:23:42 -0500 Subject: bcfg2-yum-helper: Fix python3 syntax error Signed-off-by: Sol Jerome --- src/sbin/bcfg2-yum-helper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sbin') diff --git a/src/sbin/bcfg2-yum-helper b/src/sbin/bcfg2-yum-helper index 161aa3e50..643d0ccd9 100755 --- a/src/sbin/bcfg2-yum-helper +++ b/src/sbin/bcfg2-yum-helper @@ -304,7 +304,7 @@ def main(): try: # this code copied from yumcommands.py cachemgr.populate_cache() - print json.dumps(True) + print(json.dumps(True)) except yum.Errors.YumBaseError: logger.error("Unexpected error creating cache: %s" % sys.exc_info()[1], exc_info=1) -- cgit v1.2.3-1-g7c22 From 736d98688db0ad853a14d58a5fa395a9844dc590 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Sat, 27 Jul 2013 18:27:25 -0500 Subject: bcfg2-yum-helper: Fix another python3 syntax error Signed-off-by: Sol Jerome --- src/sbin/bcfg2-yum-helper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sbin') diff --git a/src/sbin/bcfg2-yum-helper b/src/sbin/bcfg2-yum-helper index 643d0ccd9..59b9f5e78 100755 --- a/src/sbin/bcfg2-yum-helper +++ b/src/sbin/bcfg2-yum-helper @@ -308,7 +308,7 @@ def main(): except yum.Errors.YumBaseError: logger.error("Unexpected error creating cache: %s" % sys.exc_info()[1], exc_info=1) - print json.dumps(False) + print(json.dumps(False)) elif cmd == "complete": depsolver = DepSolver(options.config, options.verbose) try: -- cgit v1.2.3-1-g7c22 From 2a93140e6f9ea5679e4cf8241c193f31bcb87f9b Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 31 Jul 2013 08:13:14 -0400 Subject: bcfg2-yum-helper: populate group cache during makecache Fixes #128 --- src/sbin/bcfg2-yum-helper | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/sbin') diff --git a/src/sbin/bcfg2-yum-helper b/src/sbin/bcfg2-yum-helper index 59b9f5e78..b8c99953d 100755 --- a/src/sbin/bcfg2-yum-helper +++ b/src/sbin/bcfg2-yum-helper @@ -255,6 +255,10 @@ class CacheManager(YumHelper): for repo in self.yumbase.repos.listEnabled(): # this populates the cache as a side effect repo.repoXML # pylint: disable=W0104 + try: + repo.getGroups() + except yum.Errors.RepoMDError: + pass # this repo has no groups self.yumbase.repos.populateSack(mdtype='metadata', cacheonly=1) self.yumbase.repos.populateSack(mdtype='filelists', cacheonly=1) self.yumbase.repos.populateSack(mdtype='otherdata', cacheonly=1) -- cgit v1.2.3-1-g7c22 From ec7ea9d2a7e1c7c15e52c866f8fc9bb84bb0920d Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 2 Aug 2013 08:36:22 -0400 Subject: bcfg2-crypt: prevent traceback for certain decrypt failures --- src/sbin/bcfg2-crypt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/sbin') diff --git a/src/sbin/bcfg2-crypt b/src/sbin/bcfg2-crypt index 7102d06a9..0ba84fa0a 100755 --- a/src/sbin/bcfg2-crypt +++ b/src/sbin/bcfg2-crypt @@ -158,6 +158,7 @@ class CfgDecryptor(Decryptor): except Bcfg2.Encryption.EVPError: self.logger.info("Could not decrypt %s with any passphrase" % self.filename) + return False def get_destination_filename(self, original_filename): if original_filename.endswith(".crypt"): @@ -417,7 +418,7 @@ def main(): # pylint: disable=R0912,R0915 if data is None: data = getattr(tool, mode)() - if data is False: + if not data: logger.error("Failed to %s %s, skipping" % (mode, fname)) continue if setup['crypt_stdout']: -- cgit v1.2.3-1-g7c22 From 2ebb02acd1d53e1bd88793ad67ea9d0c4354c03f Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 6 Aug 2013 10:20:50 -0400 Subject: bcfg2-yum-helper: fully download group metadata during makecache --- src/sbin/bcfg2-yum-helper | 1 + 1 file changed, 1 insertion(+) (limited to 'src/sbin') diff --git a/src/sbin/bcfg2-yum-helper b/src/sbin/bcfg2-yum-helper index b8c99953d..03b672ac7 100755 --- a/src/sbin/bcfg2-yum-helper +++ b/src/sbin/bcfg2-yum-helper @@ -262,6 +262,7 @@ class CacheManager(YumHelper): self.yumbase.repos.populateSack(mdtype='metadata', cacheonly=1) self.yumbase.repos.populateSack(mdtype='filelists', cacheonly=1) self.yumbase.repos.populateSack(mdtype='otherdata', cacheonly=1) + self.yumbase.comps def main(): -- cgit v1.2.3-1-g7c22 From ddaac2a41e5f0521385e989760e6c85511e1b9f5 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 6 Aug 2013 10:35:55 -0400 Subject: bcfg2-yum-helper: disable pylint check --- src/sbin/bcfg2-yum-helper | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/sbin') diff --git a/src/sbin/bcfg2-yum-helper b/src/sbin/bcfg2-yum-helper index 03b672ac7..49baeb9c3 100755 --- a/src/sbin/bcfg2-yum-helper +++ b/src/sbin/bcfg2-yum-helper @@ -262,7 +262,8 @@ class CacheManager(YumHelper): self.yumbase.repos.populateSack(mdtype='metadata', cacheonly=1) self.yumbase.repos.populateSack(mdtype='filelists', cacheonly=1) self.yumbase.repos.populateSack(mdtype='otherdata', cacheonly=1) - self.yumbase.comps + # this does something with the groups cache as a side effect + self.yumbase.comps # pylint: disable=W0104 def main(): -- cgit v1.2.3-1-g7c22 From 7e9787c947e99b68317f5420951a296cea858daa Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 7 Aug 2013 11:37:38 -0400 Subject: Plugin: added new Caching interface This gives a single unified interface for expiring caches, no matter the plugin. This will be particularly useful with the MultiprocessingCore, as certain calls must be dispatched to child processes to expire their caches. --- src/sbin/bcfg2-info | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/sbin') diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index 451d8e49c..6008f8896 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -488,9 +488,10 @@ Bcfg2 client itself.""") alist = args.split() if len(alist): for client in self._get_client_list(alist): - self.metadata_cache.expire(client) + self.expire_caches_by_type(Bcfg2.Server.Plugin.Metadata, + key=client) else: - self.metadata_cache.expire() + self.expire_caches_by_type(Bcfg2.Server.Plugin.Metadata) def do_probes(self, args): """ probes [-p] - Get probe list for the given -- cgit v1.2.3-1-g7c22