0

Revert "Merge remote-tracking branch 'exhuma/master', PR #963"

This reverts commit e26727943f, reversing
changes made to 7bbb077704.
This commit is contained in:
Aaron Griffith
2013-12-02 07:40:00 -05:00
parent a8a2a191b8
commit df732bfa25
11 changed files with 165 additions and 219 deletions

View File

@@ -20,8 +20,6 @@ import shutil
import logging
import stat
LOG = logging.getLogger(__name__)
## useful recursive copy, that ignores common OS cruft
def mirror_dir(src, dst, entities=None):
'''copies all of the entities from src to dst'''
@@ -106,7 +104,7 @@ if renameworks:
try:
os.remove(self.tmpname)
except Exception, e:
LOG.warning("An error was raised, so I was doing "
logging.warning("An error was raised, so I was doing "
"some cleanup first, but I couldn't remove "
"'%s'!", self.tmpname)
else: