diff options
author | Lars Wirzenius <liw@liw.fi> | 2011-04-05 17:40:03 +0100 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2011-04-05 17:40:03 +0100 |
commit | dc3505cb85d500b95ed2bf15d592c49969025c9e (patch) | |
tree | 5c8f923ce82aed3c81d24218b98984020dfe958a | |
parent | 0f6d498bb4816aeb811818c596ac799b32dfd283 (diff) | |
download | obnam-dc3505cb85d500b95ed2bf15d592c49969025c9e.tar.gz |
Read repo directly, not via HookedFS.
-rw-r--r-- | obnamlib/plugins/encryption_plugin.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/obnamlib/plugins/encryption_plugin.py b/obnamlib/plugins/encryption_plugin.py index 9f67ee75..b6eceb7d 100644 --- a/obnamlib/plugins/encryption_plugin.py +++ b/obnamlib/plugins/encryption_plugin.py @@ -78,11 +78,11 @@ class EncryptionPlugin(obnamlib.ObnamPlugin): return obnamlib.encrypt_with_symmetric_key(cleartext, symmetric_key) def get_symmetric_key(self, repo, toplevel): - encoded = repo.fs.cat(os.path.join(toplevel, 'key')) + encoded = repo.fs.fs.cat(os.path.join(toplevel, 'key')) return obnamlib.decrypt_with_secret_keys(encoded) def read_keyring(self, repo, toplevel): - encrypted = repo.fs.cat(os.path.join(toplevel, 'userkeys')) + encrypted = repo.fs.fs.cat(os.path.join(toplevel, 'userkeys')) encoded = self.toplevel_read_data(encrypted, repo, toplevel) return obnamlib.Keyring(encoded=encoded) @@ -90,7 +90,7 @@ class EncryptionPlugin(obnamlib.ObnamPlugin): encoded = str(keyring) encrypted = self.toplevel_write_data(encoded, repo, toplevel) pathname = os.path.join(toplevel, 'userkeys') - repo.fs.overwrite_file(pathname, encrypted) + repo.fs.fs.overwrite_file(pathname, encrypted) def add_to_userkeys(self, repo, toplevel, public_key): userkeys = self.read_keyring(repo, toplevel) |