Skip to content

Fix issues raised by linter #738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emtuls merged 2 commits into from
Dec 17, 2025
Merged

Fix issues raised by linter #738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
798ef93
fix linter issue with quotes
emtuls Dec 17, 2025
2add263
fix issue with common.vm cmdlet not recognized
emtuls Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion virtualbox/vbox-build-flare-vm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,10 @@ def build_vm(vm_name, exported_vm_name, snapshots, date, custom_config, do_not_i
notice_file_name = snapshot.get("legal_notice", None)
if notice_file_name:
notice_file_path = rf"C:\Users\{GUEST_USERNAME}\Desktop\{notice_file_name}"
set_notice_cmd = f"Import-Module $env:VM_COMMON_DIR\\vm.common\\vm.common.psm1; VM-Set-Legal-Notice (Get-Content '{notice_file_path}' -Raw)"
set_notice_cmd = (
f"Import-Module $env:VM_COMMON_DIR\\vm.common\\vm.common.psm1; "
f"VM-Set-Legal-Notice (Get-Content '{notice_file_path}' -Raw)"
)
run_command(vm_uuid, set_notice_cmd)

# Perform clean up: run 'VM-Clean-Up' excluding configured files and folders
Expand Down
2 changes: 1 addition & 1 deletion virtualbox/vboxcommon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def __run_vboxmanage(cmd, real_time=False):
# which can cause conflicts with external binaries like VBoxManage.
# We create a clean environment for the subprocess to use the system's libraries.
env = os.environ.copy()
if getattr(sys, 'frozen', False) and "LD_LIBRARY_PATH" in env:
if getattr(sys, "frozen", False) and "LD_LIBRARY_PATH" in env:
# 'sys.frozen' is True when running from a PyInstaller executable.
# We can either remove the variable or, more safely, restore the original
# one if PyInstaller saved it. PyInstaller often saves it as LD_LIBRARY_PATH_ORIG.
Expand Down