Commit 7b2992eb authored by Greg Ward's avatar Greg Ward

Ensure that 'make_archive()' returns the name of the new archive file.

parent 0534a48d
...@@ -127,7 +127,6 @@ def check_archive_formats (formats): ...@@ -127,7 +127,6 @@ def check_archive_formats (formats):
def make_archive (base_name, format, def make_archive (base_name, format,
root_dir=None, base_dir=None, root_dir=None, base_dir=None,
verbose=0, dry_run=0): verbose=0, dry_run=0):
"""Create an archive file (eg. zip or tar). 'base_name' is the name """Create an archive file (eg. zip or tar). 'base_name' is the name
of the file to create, minus any format-specific extension; 'format' of the file to create, minus any format-specific extension; 'format'
is the archive format: one of "zip", "tar", "ztar", or "gztar". is the archive format: one of "zip", "tar", "ztar", or "gztar".
...@@ -136,8 +135,8 @@ def make_archive (base_name, format, ...@@ -136,8 +135,8 @@ def make_archive (base_name, format,
archive. 'base_dir' is the directory where we start archiving from; archive. 'base_dir' is the directory where we start archiving from;
ie. 'base_dir' will be the common prefix of all files and ie. 'base_dir' will be the common prefix of all files and
directories in the archive. 'root_dir' and 'base_dir' both default directories in the archive. 'root_dir' and 'base_dir' both default
to the current directory.""" to the current directory. Returns the name of the archive file.
"""
save_cwd = os.getcwd() save_cwd = os.getcwd()
if root_dir is not None: if root_dir is not None:
if verbose: if verbose:
...@@ -160,11 +159,13 @@ def make_archive (base_name, format, ...@@ -160,11 +159,13 @@ def make_archive (base_name, format,
func = format_info[0] func = format_info[0]
for (arg,val) in format_info[1]: for (arg,val) in format_info[1]:
kwargs[arg] = val kwargs[arg] = val
apply (func, (base_name, base_dir), kwargs) filename = apply (func, (base_name, base_dir), kwargs)
if root_dir is not None: if root_dir is not None:
if verbose: if verbose:
print "changing back to '%s'" % save_cwd print "changing back to '%s'" % save_cwd
os.chdir (save_cwd) os.chdir (save_cwd)
return filename
# make_archive () # make_archive ()
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment