From 291d99bc66c4c2b8009ba723a43e2e97d24313f9 Mon Sep 17 00:00:00 2001
From: Tess Chu <tess@lindenlab.com>
Date: Thu, 15 Nov 2007 19:22:19 +0000
Subject: svn merge -r73220:73877
 svn+ssh://svn/svn/linden/branches/viewer-auth-6

---
 indra/lib/python/indra/util/llmanifest.py | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra/lib')

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):
-- 
cgit v1.2.3