[Python-checkins] python/dist/src/Lib shutil.py,1.34,1.34.2.1

[birkenfeld@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv321/Lib

Modified Files:
      Tag: release24-maint
	shutil.py 
Log Message:
patch [ 1242454 ] shutil.copytree() quits too soon after an error.



Index: shutil.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/shutil.py,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -u -d -r1.34 -r1.34.2.1
--- shutil.py	31 Oct 2004 12:05:31 -0000	1.34
+++ shutil.py	31 Aug 2005 22:48:48 -0000	1.34.2.1
@@ -124,6 +124,10 @@
             # XXX What about devices, sockets etc.?
         except (IOError, os.error), why:
             errors.append((srcname, dstname, why))
+        # catch the Error from the recursive copytree so that we can
+        # continue with other files
+        except Error, err:
+            errors.extend(err.args[0])
     if errors:
         raise Error, errors