upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-05 14:54:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

corrected config revert

Browse source
This commit is contained in:
James Kasten 2012-08-16 17:11:41 -04:00
parent 29ec7859f4
commit 6bf01a75d6
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
trustify/client/configurator.py
View file

@ -5,6 +5,7 @@ import os
import sys
import socket
import time
import shutil
from trustify.client.CONFIG import SERVER_ROOT, BACKUP_DIR, MODIFIED_FILES
#TODO - Stop Augeas from loading up backup emacs files in sites-available
@ -584,7 +585,7 @@ class Configurator(object):
for path in save_paths:
# Strip off /files
filename = self.aug.get(path)[6:]
if filename in self.mod_files:
if filename in mod_files:
# Output a warning... hopefully this can be avoided so more
# complex code doesn't have to be written
print "Reversible file has been overwritten -", filename
@ -632,14 +633,16 @@ class Configurator(object):
sys.exit()
try:
for f in self.mod_files:
shutil.copy2(f.rstrip() + ".augsave", f)
self.aug.load()
for f in mod_files:
shutil.copy2(f.rstrip() + ".augsave", f.rstrip())
self.aug.load()
# Clear file
mod_fd = open(MODIFIED_FILES, 'w')
mod_fd.close()
except:
except Exception as e:
print "Error reverting configuration"
print e
sys.exit(36)