diff options
| author | Tess Chu <tess@lindenlab.com> | 2007-11-20 02:53:43 +0000 |
|---|---|---|
| committer | Tess Chu <tess@lindenlab.com> | 2007-11-20 02:53:43 +0000 |
| commit | 2f6c7606241acdf800a2c079b359e7a1db360954 (patch) | |
| tree | adb6e6e34f9c3df1e2252b2f763ae20970c0e2d4 /indra/lib/python | |
| parent | 813b140d0767146b17acf4ad2fb96fbd5a347c34 (diff) | |
svn merge -r 73926:74098 svn+ssh://svn/svn/linden/branches/viewer-auth-7
Diffstat (limited to 'indra/lib/python')
| -rw-r--r-- | indra/lib/python/indra/util/llmanifest.py | 7 |
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): |