diff options
author | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-01-21 18:11:20 (GMT) |
---|---|---|
committer | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-01-21 18:11:20 (GMT) |
commit | e999c1c1e143ec1b6f9b171ae48d8399c2f60c5c (patch) | |
tree | 761209b56ba06b6a3bb067fbdaef3d5a4a1aea8f | |
parent | 0fc85c567d8cdccaaaac100a8e745f6d1d79c94a (diff) |
Only try to remove the checksum dir if it already exists
-rw-r--r-- | src/olpc/datastore/optimizer.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/olpc/datastore/optimizer.py b/src/olpc/datastore/optimizer.py index 2376ceb..8bad683 100644 --- a/src/olpc/datastore/optimizer.py +++ b/src/olpc/datastore/optimizer.py @@ -63,12 +63,13 @@ class Optimizer(object): logging.debug('remove %r' % checksum_entry_path) os.remove(checksum_entry_path) - try: - os.rmdir(checksum_path) - logging.debug('removed %r' % checksum_path) - except OSError, e: - if e.errno != errno.ENOTEMPTY: - raise + if os.path.exists(checksum_path): + try: + os.rmdir(checksum_path) + logging.debug('removed %r' % checksum_path) + except OSError, e: + if e.errno != errno.ENOTEMPTY: + raise def _identical_file_already_exists(self, checksum): """Check if we already have files with this checksum. |