svn merge -r73220:73877 svn+ssh://svn/svn/linden/branches/viewer-auth-6

1 files changed, 7 insertions, 0 deletions

diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py
index 029b697e83..2408fab96f 100644
--- a/indra/lib/python/indra/util/llmanifest.py
+++ b/indra/lib/python/indra/util/llmanifest.py
@@ -38,6 +38,7 @@ import re
 import shutil
 import sys
 import tarfile
+import errno
 
 def path_ancestors(path):
     path = os.path.normpath(path)
@@ -463,6 +464,12 @@ class LLManifest(object):
                 return
             # only copy if it's not excluded
             if(self.includes(src, dst)):
+                try:
+                    os.unlink(dst)
+                except OSError, err:
+                    if err.errno != errno.ENOENT:
+                        raise
+
                 shutil.copy2(src, dst)
 
     def ccopytree(self, src, dst):