From 813b140d0767146b17acf4ad2fb96fbd5a347c34 Mon Sep 17 00:00:00 2001
From: Tess Chu <tess@lindenlab.com>
Date: Thu, 15 Nov 2007 22:39:12 +0000
Subject: svn merge -r73880:73879 svn+ssh://svn/svn/linden/release. backing out
 viewer auth merge

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

(limited to 'indra/lib')

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