From 2c4ab013b0bc245c0367385b2130dc7216528077 Mon Sep 17 00:00:00 2001 From: Andrew Gunnerson Date: Sat, 11 Feb 2023 18:11:12 -0500 Subject: [PATCH 1/3] avbroot.py: Make script executable Signed-off-by: Andrew Gunnerson --- avbroot.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 avbroot.py diff --git a/avbroot.py b/avbroot.py old mode 100644 new mode 100755 From 6a5ce3815ea549fab753db25636b0d797b37e411 Mon Sep 17 00:00:00 2001 From: Andrew Gunnerson Date: Sat, 11 Feb 2023 18:12:04 -0500 Subject: [PATCH 2/3] avbroot.py: extract: Create output directory if it doesn't already exist Signed-off-by: Andrew Gunnerson --- avbroot.py | 1 + 1 file changed, 1 insertion(+) diff --git a/avbroot.py b/avbroot.py index 746e235..ffae0b4 100755 --- a/avbroot.py +++ b/avbroot.py @@ -306,6 +306,7 @@ def extract_subcommand(args): images, _, _ = get_images(manifest) print_status('Extracting', ', '.join(images), 'from the payload') + os.makedirs(args.directory, exist_ok=True) ota.extract_images(f, manifest, blob_offset, args.directory, images) From a709854c3a1101bda97794395cbd30699c33782a Mon Sep 17 00:00:00 2001 From: Andrew Gunnerson Date: Sat, 11 Feb 2023 18:12:44 -0500 Subject: [PATCH 3/3] avbroot/ota.py: Improve silencing of irrelevant AOSP warning common.py really wants sys.argv[0] to be just an executable name with no path or extension. Signed-off-by: Andrew Gunnerson --- avbroot/ota.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avbroot/ota.py b/avbroot/ota.py index cc9ae8b..c7418ba 100644 --- a/avbroot/ota.py +++ b/avbroot/ota.py @@ -14,7 +14,7 @@ import zipfile # Silence undesired warning orig_argv0 = sys.argv[0] -sys.argv[0] = sys.argv[0].removesuffix('.py') +sys.argv[0] = os.path.basename(sys.argv[0]).removesuffix('.py') import ota_utils sys.argv[0] = orig_argv0