From de9a22b3f3725156a74c55bfadd1f978e98f453c Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Wed, 22 Feb 2012 16:40:29 -0500 Subject: Remove unused kpasswd.keytab and ldappwd files if they exist. These were used by ipa_kpasswd and krb5-server-ldap respectivily. https://fedorahosted.org/freeipa/ticket/2397 --- ipapython/sysrestore.py | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'ipapython/sysrestore.py') diff --git a/ipapython/sysrestore.py b/ipapython/sysrestore.py index 8177a1bf2..82817acad 100644 --- a/ipapython/sysrestore.py +++ b/ipapython/sysrestore.py @@ -226,6 +226,49 @@ class FileStore: return len(self.files) > 0 + def untrack_file(self, path): + """Remove file at path @path from list of backed up files. + + Does not remove any files from the filesystem. + + Returns #True if the file was untracked, #False if there + was no backup file to restore + """ + + root_logger.debug("Untracking system configuration file '%s'", path) + + if not os.path.isabs(path): + raise ValueError("Absolute path required") + + mode = None + uid = None + gid = None + filename = None + + for (key, value) in self.files.items(): + (mode,uid,gid,filepath) = string.split(value, ',', 3) + if (filepath == path): + filename = key + break + + if not filename: + raise ValueError("No such file name in the index") + + backup_path = os.path.join(self._path, filename) + if not os.path.exists(backup_path): + root_logger.debug(" -> Not restoring - '%s' doesn't exist", backup_path) + return False + + try: + os.unlink(backup_path) + except Exception, e: + root_logger.error('Error removing %s: %s' % (backup_path, str(e))) + + del self.files[filename] + self.save() + + return True + class StateFile: """A metadata file for recording system state which can be backed up and later restored. The format is something -- cgit