diff options
author | Tess Chu <tess@lindenlab.com> | 2007-11-15 22:39:12 +0000 |
---|---|---|
committer | Tess Chu <tess@lindenlab.com> | 2007-11-15 22:39:12 +0000 |
commit | 813b140d0767146b17acf4ad2fb96fbd5a347c34 (patch) | |
tree | d47a36708813b3f93b4049d822f966c48de4e576 /indra/lib | |
parent | 291d99bc66c4c2b8009ba723a43e2e97d24313f9 (diff) |
svn merge -r73880:73879 svn+ssh://svn/svn/linden/release. backing out viewer auth merge
Diffstat (limited to 'indra/lib')
-rw-r--r-- | indra/lib/python/indra/util/llmanifest.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py index 2408fab96f..029b697e83 100644 --- a/indra/lib/python/indra/util/llmanifest.py +++ b/indra/lib/python/indra/util/llmanifest.py @@ -38,7 +38,6 @@ import re import shutil import sys import tarfile -import errno def path_ancestors(path): path = os.path.normpath(path) @@ -464,12 +463,6 @@ 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): |