Merge branch 'Munki6dev' into swift-cli

2026-05-04 03:20:19 -05:00 · 2025-01-17 10:53:52 -08:00
parent 7da1b832d0 40b44aef2a
commit d99fa65234
1 changed files with 1 additions and 1 deletions
@@ -124,7 +124,7 @@ def extractAppBitsFromPkgArchive(archive_path, target_dir):
               '*.app/Contents/Info.plist',
               '*.app/Contents/Resources/*.icns']
        result = subprocess.call(cmd)
-        if result != 0:
+        if result != 0 and os.path.exists("/usr/bin/aa"):
            # pax failed. Maybe Apple Archive format?
            cmd = ["/usr/bin/aa", "extract",
                   "-i", archive_path,