diff options
| -rwxr-xr-x | puppethost.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/puppethost.py b/puppethost.py index bbdceba..bd7d2af 100755 --- a/puppethost.py +++ b/puppethost.py @@ -238,11 +238,6 @@ def _main(): opts.force_tarball = True opts.force_package = True - opts.rpmdir = os.path.abspath(opts.rpmdir) - opts.ssldir = os.path.abspath(opts.ssldir) - if not opts.destssldir: - opts.destssldir = opts.ssldir - if opts.allcerts: args = [] for cert in glob.glob('%s/ca/signed/*.pem' % opts.ssldir): @@ -255,10 +250,15 @@ def _main(): if not args: raise SystemExit(parser.print_usage()) + opts.rpmdir = os.path.abspath(opts.rpmdir) + opts.ssldir = os.path.abspath(opts.ssldir) for d in [opts.rpmdir, opts.ssldir]: if not os.path.isdir(d): raise SystemExit('%s does not exist (or is not a directory)' % d) + if not opts.destssldir: + opts.destssldir = opts.ssldir + if not os.path.isfile(opts.template): raise SystemExit('Template file (%s) does not exist' % opts.template) |