From 6bf01a75d64b5b5815e3a56a8bcdf13cc14ce3ad Mon Sep 17 00:00:00 2001 From: James Kasten Date: Thu, 16 Aug 2012 17:11:41 -0400 Subject: [PATCH] corrected config revert --- trustify/client/configurator.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/trustify/client/configurator.py b/trustify/client/configurator.py index 7982b36b9..3fba009b9 100644 --- a/trustify/client/configurator.py +++ b/trustify/client/configurator.py @@ -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)