summaryrefslogtreecommitdiff
path: root/boto/glacier/vault.py
diff options
context:
space:
mode:
Diffstat (limited to 'boto/glacier/vault.py')
-rw-r--r--boto/glacier/vault.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/boto/glacier/vault.py b/boto/glacier/vault.py
index 4d0e0723..dc691f3c 100644
--- a/boto/glacier/vault.py
+++ b/boto/glacier/vault.py
@@ -115,7 +115,8 @@ class Vault(object):
description)
return Writer(self, response['UploadId'], part_size=part_size)
- def create_archive_from_file(self, filename=None, file_obj=None):
+ def create_archive_from_file(self, filename=None, file_obj=None,
+ description=None):
"""
Create a new archive and upload the data from the given file
or file-like object.
@@ -132,7 +133,7 @@ class Vault(object):
if not file_obj:
file_obj = open(filename, "rb")
- writer = self.create_archive_writer()
+ writer = self.create_archive_writer(description=description)
while True:
data = file_obj.read(self.DefaultPartSize)
if not data: