paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 21:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

export: Remove --delete-after-upload flag in realm export.

Browse Source 
For export realm following changes have been made:
- `./manage.py export --upload` would delete `.tar.gz` and unpacked dir
- `./manage.py export` would only delete `unpacked dir`

Besides, we have removed `--delete-after-upload` as we have set it as
the default.

Fixes #20081
This commit is contained in:
Shlok Patel
2021-11-02 14:09:17 +05:30
committed by Tim Abbott
parent 4d055a6695
commit 893c9bc896
4 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zerver/lib/export.py
View File

@@ -1947,7 +1947,6 @@ def export_realm_wrapper(
threads: int,
upload: bool,
public_only: bool,
delete_after_upload: bool,
percent_callback: Optional[Callable[[Any], None]] = None,
consent_message_id: Optional[int] = None,
) -> Optional[str]:
@@ -1958,9 +1957,8 @@ def export_realm_wrapper(
public_only=public_only,
consent_message_id=consent_message_id,
)
print(f"Finished exporting to {output_dir}")
shutil.rmtree(output_dir)
print(f"Tarball written to {tarball_path}")
if not upload:
return None
@@ -1971,12 +1969,10 @@ def export_realm_wrapper(
public_url = zerver.lib.upload.upload_backend.upload_export_tarball(
realm, tarball_path, percent_callback=percent_callback
)
print()
print(f"Uploaded to {public_url}")
print(f"\nUploaded to {public_url}")
if delete_after_upload:
os.remove(tarball_path)
print(f"Successfully deleted the tarball at {tarball_path}")
os.remove(tarball_path)
print(f"Successfully deleted the tarball at {tarball_path}")
return public_url