summaryrefslogtreecommitdiffstats
path: root/base/deploy/src/pkidestroy
diff options
context:
space:
mode:
authorAde Lee <alee@redhat.com>2012-11-09 12:31:40 -0500
committerAde Lee <alee@redhat.com>2012-11-10 23:10:15 -0500
commit318716f3425a1d818e0633453a1d27a68d2f7f5f (patch)
treef49fcbbbd90e9e9d04c5df7cd30b46cf035ba1dc /base/deploy/src/pkidestroy
parent019a93341dde3e1e21a7e2b0edfa2003118ce928 (diff)
downloadpki-318716f3425a1d818e0633453a1d27a68d2f7f5f.tar.gz
pki-318716f3425a1d818e0633453a1d27a68d2f7f5f.tar.xz
pki-318716f3425a1d818e0633453a1d27a68d2f7f5f.zip
removed dry_run from pkispawn
Ticket 411
Diffstat (limited to 'base/deploy/src/pkidestroy')
-rwxr-xr-xbase/deploy/src/pkidestroy16
1 files changed, 6 insertions, 10 deletions
diff --git a/base/deploy/src/pkidestroy b/base/deploy/src/pkidestroy
index 165ccb06c..82632fc1a 100755
--- a/base/deploy/src/pkidestroy
+++ b/base/deploy/src/pkidestroy
@@ -95,16 +95,12 @@ def main(argv):
parse.process_command_line_arguments(argv)
# Enable 'pkidestroy' logging.
- if not config.pki_dry_run_flag:
- config.pki_log_dir = config.pki_root_prefix +\
- config.PKI_DEPLOYMENT_LOG_ROOT
- config.pki_log_name = "pki" + "-" +\
- config.pki_subsystem.lower() +\
- "-" + "destroy" + "." +\
- config.pki_timestamp + "." + "log"
- else:
- config.pki_log_dir = "/dev"
- config.pki_log_name = "null"
+ config.pki_log_dir = config.pki_root_prefix +\
+ config.PKI_DEPLOYMENT_LOG_ROOT
+ config.pki_log_name = "pki" + "-" +\
+ config.pki_subsystem.lower() +\
+ "-" + "destroy" + "." +\
+ config.pki_timestamp + "." + "log"
rv = pkilogging.enable_pki_logger(config.pki_log_dir,
config.pki_log_name,
config.pki_log_level,