Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu@sugarlabs.org>2009-01-21 08:35:30 (GMT)
committer Tomeu Vizoso <tomeu@sugarlabs.org>2009-01-21 08:35:30 (GMT)
commit0fc85c567d8cdccaaaac100a8e745f6d1d79c94a (patch)
treef5732738ec9860068765c64e8d489a4c942d565b
parente6505bc570c727cc1a254d6ecd8de07e8c464fed (diff)
Don't raise an exception if the checksum entry hasn't been created yet
-rw-r--r--src/olpc/datastore/optimizer.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/olpc/datastore/optimizer.py b/src/olpc/datastore/optimizer.py
index 74763b3..2376ceb 100644
--- a/src/olpc/datastore/optimizer.py
+++ b/src/olpc/datastore/optimizer.py
@@ -57,9 +57,12 @@ class Optimizer(object):
checksums_dir = layoutmanager.get_instance().get_checksums_dir()
checksum_path = os.path.join(checksums_dir, checksum)
+ checksum_entry_path = os.path.join(checksum_path, uid)
+
+ if os.path.exists(checksum_entry_path):
+ logging.debug('remove %r' % checksum_entry_path)
+ os.remove(checksum_entry_path)
- logging.debug('remove %r' % os.path.join(checksum_path, uid))
- os.remove(os.path.join(checksum_path, uid))
try:
os.rmdir(checksum_path)
logging.debug('removed %r' % checksum_path)