summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugins/Packages
diff options
context:
space:
mode:
authorGordon Messmer <gordon@dragonsdawn.net>2016-04-21 14:01:37 -0700
committerGordon Messmer <gordon@dragonsdawn.net>2016-04-21 14:01:37 -0700
commit5fdbe15b605aad556e9bb991d2fe899f49434200 (patch)
treece0cf614450875ab7dc67d754fa077f0bf054f1b /src/lib/Bcfg2/Server/Plugins/Packages
parent46a155cfec84dc36c34b107b9e51f99c0b684468 (diff)
downloadbcfg2-5fdbe15b605aad556e9bb991d2fe899f49434200.tar.gz
bcfg2-5fdbe15b605aad556e9bb991d2fe899f49434200.tar.bz2
bcfg2-5fdbe15b605aad556e9bb991d2fe899f49434200.zip
Only read input if accept_input is True.
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Packages')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Packages/YumHelper.py15
1 files 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)))