From 5fdbe15b605aad556e9bb991d2fe899f49434200 Mon Sep 17 00:00:00 2001 From: Gordon Messmer Date: Thu, 21 Apr 2016 14:01:37 -0700 Subject: Only read input if accept_input is True. --- src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py b/src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py index ec253208f..ddc684628 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py @@ -283,13 +283,14 @@ class HelperSubcommand(Bcfg2.Options.Subcommand): self.verbosity = 1 def run(self, setup): - try: - data = json.loads(sys.stdin.read()) - except ValueError: - self.logger.error("Error decoding JSON input: %s" % - sys.exc_info()[1]) - print(json.dumps(self.fallback)) - return 2 + if accept_input: + try: + data = json.loads(sys.stdin.read()) + except ValueError: + self.logger.error("Error decoding JSON input: %s" % + sys.exc_info()[1]) + print(json.dumps(self.fallback)) + return 2 try: print(json.dumps(self._run(setup, data))) -- cgit v1.2.3-1-g7c22