diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2021-02-04 02:42:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2021-02-04 02:42:34 +0000 |
| commit | 7937f07593e81b8a42f787d06c0f3c0797642bc4 (patch) | |
| tree | 0684edf223558c86625ce555119d21312b5469fd /jjb | |
| parent | eff6ddf51d350123b490a8326d8b21681eb47765 (diff) | |
| parent | 30ac6e735733993c6a15e173438eb79811cc3b49 (diff) | |
Merge "backup upload archives: avoid gzip compressing the files if they are already compressed"
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/scripts/backup_upload_archives.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/jjb/scripts/backup_upload_archives.sh b/jjb/scripts/backup_upload_archives.sh index a7eb16631..1a9c577e1 100755 --- a/jjb/scripts/backup_upload_archives.sh +++ b/jjb/scripts/backup_upload_archives.sh @@ -77,11 +77,13 @@ def upload(storage, bucket, src_fpath, dst_fpath): :type src_fpath: str :type dst_fpath: str """ - mime = MimeTypes().guess_type(src_fpath)[0] + mime_guess = MimeTypes().guess_type(src_fpath) + mime = mime_guess[0] + encoding = mime_guess[1] if not mime: mime = "application/octet-stream" - if mime in COMPRESS_MIME and bucket in "logs": + if mime in COMPRESS_MIME and bucket in "logs" and encoding != "gzip": compress(src_fpath) src_fpath = src_fpath + ".gz" dst_fpath = dst_fpath + ".gz" |