[Python-checkins] distutils2: fixed bad merge

Sun Jan 30 14:49:23 CET 2011

tarek.ziade pushed cc0a674dca07 to distutils2:
http://hg.python.org/distutils2/rev/cc0a674dca07
changeset: 967:cc0a674dca07
user: Tarek Ziade <tarek at ziade.org>
date: Sun Jan 30 12:02:03 2011 +0100
summary:
 fixed bad merge
files:
 distutils2/_backport/shutil.py

diff --git a/distutils2/_backport/shutil.py b/distutils2/_backport/shutil.py
--- a/distutils2/_backport/shutil.py
+++ b/distutils2/_backport/shutil.py
@@ -742,6 +742,8 @@
 if extract_dir is None:
 extract_dir = os.getcwd()
 
+ func = None
+
 if format is not None:
 try:
 format_info = _UNPACK_FORMATS[format]
@@ -758,4 +760,7 @@
 
 func = _UNPACK_FORMATS[format][1]
 kwargs = dict(_UNPACK_FORMATS[format][2])
- raise ValueError('Unknown archive format: %s' % filename)
+ func(filename, extract_dir, **kwargs)
+
+ if func is None:
+ raise ValueError('Unknown archive format: %s' % filename)
--
Repository URL: http://hg.python.org/distutils2
