bup 0.13.0__tar.gz → 0.13.2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {bup-0.13.0/bup.egg-info → bup-0.13.2}/PKG-INFO +1 -1
- {bup-0.13.0 → bup-0.13.2}/bup/__version__.py +1 -1
- {bup-0.13.0 → bup-0.13.2}/bup/aws_cli.py +4 -1
- {bup-0.13.0 → bup-0.13.2}/bup/s3_backup.py +2 -2
- {bup-0.13.0 → bup-0.13.2/bup.egg-info}/PKG-INFO +1 -1
- {bup-0.13.0 → bup-0.13.2}/pyproject.toml +1 -1
- {bup-0.13.0 → bup-0.13.2}/LICENSE +0 -0
- {bup-0.13.0 → bup-0.13.2}/LICENSE.txt +0 -0
- {bup-0.13.0 → bup-0.13.2}/README.md +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/LICENSE +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/__init__.py +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/__main__.py +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/arguments.py +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/backup_types.py +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/bup.ico +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/bup.png +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/bup_base.py +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/cli/__init__.py +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/cli/cli_main.py +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/dynamodb_backup.py +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/github_backup.py +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/gpl-3.0.md +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/gui/__init__.py +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/gui/about.py +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/gui/bup_dialog.py +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/gui/gui_icon.py +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/gui/gui_main.py +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/gui/log_widget.py +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/gui/preferences_widget.py +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/gui/run_backup_widget.py +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/log_routing.py +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/preferences.py +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/robust_os_calls.py +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup/ui_types.py +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup.egg-info/SOURCES.txt +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup.egg-info/dependency_links.txt +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup.egg-info/entry_points.txt +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup.egg-info/requires.txt +0 -0
- {bup-0.13.0 → bup-0.13.2}/bup.egg-info/top_level.txt +0 -0
- {bup-0.13.0 → bup-0.13.2}/setup.cfg +0 -0
|
@@ -16,6 +16,9 @@ log = get_logger(__application_name__)
|
|
|
16
16
|
|
|
17
17
|
decoding = "utf-8"
|
|
18
18
|
|
|
19
|
+
# on Windows, a console-less parent (e.g. the GUI app) spawning the AWS CLI would otherwise pop up a new console window
|
|
20
|
+
subprocess_creation_flags = subprocess.CREATE_NO_WINDOW if sys.platform == "win32" else 0
|
|
21
|
+
|
|
19
22
|
awscli_pypi_url = "https://pypi.org/pypi/awscli/json"
|
|
20
23
|
|
|
21
24
|
|
|
@@ -64,7 +67,7 @@ def get_aws_cli_version(aws_cli_path: Path, env_var: dict) -> Optional[str]:
|
|
|
64
67
|
"""
|
|
65
68
|
command_line = [str(aws_cli_path), "--version"]
|
|
66
69
|
try:
|
|
67
|
-
result = subprocess.run(command_line, env=env_var, capture_output=True, timeout=60.0)
|
|
70
|
+
result = subprocess.run(command_line, env=env_var, capture_output=True, timeout=60.0, creationflags=subprocess_creation_flags)
|
|
68
71
|
except (OSError, subprocess.SubprocessError) as e:
|
|
69
72
|
log.warning(f'error executing {" ".join(command_line)} : {e}')
|
|
70
73
|
return None
|
|
@@ -12,7 +12,7 @@ logging.getLogger("boto3").setLevel(logging.WARNING)
|
|
|
12
12
|
logging.getLogger("botocore").setLevel(logging.WARNING)
|
|
13
13
|
|
|
14
14
|
from bup import __application_name__, BupBase, BackupTypes, get_preferences, ExclusionPreferences
|
|
15
|
-
from bup.aws_cli import find_aws_cli, make_aws_cli_env, get_aws_cli_version, get_latest_awscli_version, check_aws_cli_version
|
|
15
|
+
from bup.aws_cli import find_aws_cli, make_aws_cli_env, get_aws_cli_version, get_latest_awscli_version, check_aws_cli_version, subprocess_creation_flags
|
|
16
16
|
|
|
17
17
|
log = get_logger(__application_name__)
|
|
18
18
|
|
|
@@ -89,7 +89,7 @@ class S3Backup(BupBase):
|
|
|
89
89
|
Run a subprocess, polling for a stop request. On stop, terminate the subprocess so it isn't orphaned.
|
|
90
90
|
:return: (returncode, stdout, stderr)
|
|
91
91
|
"""
|
|
92
|
-
process = subprocess.Popen(command_line, env=env_var, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
|
92
|
+
process = subprocess.Popen(command_line, env=env_var, stdout=subprocess.PIPE, stderr=subprocess.PIPE, creationflags=subprocess_creation_flags)
|
|
93
93
|
while True:
|
|
94
94
|
try:
|
|
95
95
|
stdout, stderr = process.communicate(timeout=1.0)
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|