diff options
| -rw-r--r-- | scripts/dailyimgupload.py | 5 | ||||
| -rw-r--r-- | scripts/s3upload.py | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/scripts/dailyimgupload.py b/scripts/dailyimgupload.py index db78a83..4bf5f30 100644 --- a/scripts/dailyimgupload.py +++ b/scripts/dailyimgupload.py @@ -2,6 +2,7 @@ import ctypes import datetime
import os
import platform
+import shutil
import sys
import traceback
import s3upload
@@ -90,6 +91,10 @@ def upload_dirs_until_free(path, target_free_mbs, dryrun): dirs_uploaded += 1
reclaimed_space += dir_size
+
+ if not dryrun:
+ print "Deleting %s" % dir_to_upload
+ shutil.rmtree(dir_to_upload)
if dryrun:
cur_freespace += dir_size
diff --git a/scripts/s3upload.py b/scripts/s3upload.py index 163f3b6..e761ea5 100644 --- a/scripts/s3upload.py +++ b/scripts/s3upload.py @@ -22,6 +22,8 @@ def get_or_initialize_aws_connection(): def retry_func(f, count): try: f() + except KeyboardInterrupt: + raise except: if count <= 1: raise else: |