From c8cc419f5f9a51f3bafe7353e76d157aeabe9b93 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Tue, 25 Nov 2008 21:35:52 -0500 Subject: Replace ssldir in template after options are read This ensures that the template will use the provided ssldir option. --- puppethost.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/puppethost.py b/puppethost.py index 79a28f9..25f16cf 100755 --- a/puppethost.py +++ b/puppethost.py @@ -22,7 +22,7 @@ defaults = { 'release': '1', 'rpmdir': os.path.abspath(os.curdir), 'ssldir': ssldir, - 'template': '%s/template.spec' % ssldir, + 'template': '%(ssldir)s/template.spec', } del ssldir @@ -259,6 +259,7 @@ def _main(): if not opts.destssldir: opts.destssldir = opts.ssldir + opts.template = opts.template % opts.__dict__ if not os.path.isfile(opts.template): raise SystemExit('Template file (%s) does not exist' % opts.template) -- cgit