diff options
| author | John Eckersberg <jeckersb@redhat.com> | 2009-04-14 20:29:13 -0400 |
|---|---|---|
| committer | John Eckersberg <jeckersb@redhat.com> | 2009-04-14 20:55:50 -0400 |
| commit | ee155a3ef1e409ef69d2f6e51e770092924518b2 (patch) | |
| tree | b413d08d6ca704797decd3a9a93d681d6227451a | |
| parent | 059e1938d456dcc225dff3bda002d253d01855ee (diff) | |
| download | func-m2m-merge.tar.gz func-m2m-merge.tar.xz func-m2m-merge.zip | |
Uncomment try/except that should have been removed after debugging.m2m-merge
| -rw-r--r-- | func/minion/modules/certmastermod.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/func/minion/modules/certmastermod.py b/func/minion/modules/certmastermod.py index c4641d0..41f093c 100644 --- a/func/minion/modules/certmastermod.py +++ b/func/minion/modules/certmastermod.py @@ -95,11 +95,11 @@ class CertMasterModule(func_module.FuncModule): for p in peers: certname = "%s.%s" % (p, cm.cfg.cert_extension) certname = os.path.join(cm.cfg.peerroot, certname) -# try: - os.unlink(certname) -# except OSError: + try: + os.unlink(certname) + except OSError: # cert doesn't exist -# pass + pass return True def copy_peer_cert(self, peer, certblob): |