compiletools 8.2.0__tar.gz → 8.2.2__tar.gz

{compiletools-8.2.0 → compiletools-8.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compiletools
-Version: 8.2.0
+Version: 8.2.2
 Summary: Tools to make compiling C/C++ projects easy
 Keywords: c++,make,development
 Author: DrGeoff
@@ -23,7 +23,7 @@ Requires-Dist: rich-rst>=1.1.7
 Requires-Dist: stringzilla>=3.0.0
 Requires-Dist: bump-my-version>=0.26.0 ; extra == 'dev'
 Requires-Dist: twine>=5.0.0 ; extra == 'dev'
-Requires-Dist: pytest>=8.2.0 ; extra == 'dev'
+Requires-Dist: pytest>=8.2.2 ; extra == 'dev'
 Requires-Dist: pytest-xdist>=3.5 ; extra == 'dev'
 Requires-Dist: ruff>=0.14.0 ; extra == 'dev'
 Requires-Dist: pyright>=1.1 ; extra == 'dev'
@@ -55,7 +55,7 @@ C/C++ build tools that requires almost no configuration.
 
 :Author: drgeoffathome@gmail.com
 :Date:   2025-12-17
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "compiletools"
-version = "8.2.0"
+version = "8.2.2"
 description = "Tools to make compiling C/C++ projects easy"
 readme = "src/compiletools/README.ct-doc.rst"
 requires-python = ">=3.10"
@@ -36,7 +36,7 @@ tui = [
 dev = [
     "bump-my-version>=0.26.0",
     "twine>=5.0.0",
-    "pytest>=8.2.0",
+    "pytest>=8.2.2",
     "pytest-xdist>=3.5",
     "ruff>=0.14.0",
     "pyright>=1.1",
@@ -96,7 +96,7 @@ include = [
 ]
 
 [tool.bumpversion]
-current_version = "8.2.0"
+current_version = "8.2.2"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.cleanup-remote-locks.rst

@@ -8,7 +8,7 @@ Legacy helper for pruning stale lockdir directories remotely
 
 :Author: drgeoffathome@gmail.com
 :Date:   2025-11-26
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.create-documentation.rst

@@ -8,7 +8,7 @@ Generate man(1) pages from the reStructuredText source tree
 
 :Author: drgeoffathome@gmail.com
 :Date:   2025-11-26
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-backends.rst

@@ -8,7 +8,7 @@ Build backend architecture and selection guide
 
 :Author: drgeoffathome@gmail.com
 :Date:   2026-04-02
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 7
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-build-dynamic-library.rst

@@ -8,7 +8,7 @@ Produce a shared object from a root source file with zero boilerplate
 
 :Author: drgeoffathome@gmail.com
 :Date:   2025-11-26
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-build-static-library.rst

@@ -8,7 +8,7 @@ Generate a static library from a root source file in one shot
 
 :Author: drgeoffathome@gmail.com
 :Date:   2025-11-26
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-build.rst

@@ -8,7 +8,7 @@ One-command Make-specific wrapper around ct-findtargets + make
 
 :Author: drgeoffathome@gmail.com
 :Date:   2025-11-26
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-cake.rst

@@ -9,7 +9,7 @@ Swiss army knife for building a C/C++ project
 :Author: drgeoffathome@gmail.com
 :Date:   2018-02-06
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-cleanup-locks.rst

@@ -8,7 +8,7 @@ Clean up stale lock directories from file locking
 
 :Author: drgeoffathome@gmail.com
 :Date:   2025-10-16
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-commandline.rst

@@ -9,7 +9,7 @@ This document describes the command line arguments that are common across ct-* p
 :Author: drgeoffathome@gmail.com
 :Date:   2017-07-06
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-compilation-database.rst

@@ -8,7 +8,7 @@ Generate compile_commands.json for clang tooling and IDE integration
 
 :Author: drgeoffathome@gmail.com
 :Date:   2025-10-08
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-config.rst

@@ -9,7 +9,7 @@ Helper tool for examining ct-* configuration
 :Author: drgeoffathome@gmail.com
 :Date:   2016-08-16
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-cppdeps.rst

@@ -9,7 +9,7 @@ C/C++ dependency analysis using the preprocessor
 :Author: drgeoffathome@gmail.com
 :Date:   2022-06-05
 :Copyright: Copyright (C) Geoffery Ericksson
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-create-makefile.rst

@@ -8,7 +8,7 @@ Generate Makefile from compiletools magic
 
 :Author: drgeoffathome@gmail.com
 :Date:   2024-11-24
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-doc.rst

@@ -15,7 +15,7 @@ C/C++ build tools that requires almost no configuration.
 
 :Author: drgeoffathome@gmail.com
 :Date:   2025-12-17
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-filelist.rst

@@ -9,7 +9,7 @@ Determine header and source dependencies of a C/C++ file by following headers an
 :Author: drgeoffathome@gmail.com
 :Date:   2017-07-06
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-findtargets.rst

@@ -9,7 +9,7 @@ Find executable and test targets in a C/C++ project
 :Author: drgeoffathome@gmail.com
 :Date:   2018-04-17
 :Copyright: Copyright (C) 2011-2018 Zomojo Pty Ltd
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-git-sha-report.rst

@@ -8,7 +8,7 @@ Report git blob SHA hashes for files in the repository
 
 :Author: drgeoffathome@gmail.com
 :Date:   2024-11-24
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-gitroot.rst

@@ -9,7 +9,7 @@ Display the git repository root directory
 :Author: drgeoffathome@gmail.com
 :Date:   2017-09-28
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-headertree.rst

@@ -9,7 +9,7 @@ Create a tree of header dependencies starting at the given C/C++ file
 :Author: drgeoffathome@gmail.com
 :Date:   2018-07-26
 :Copyright: Copyright (C) 2011-2018 Zomojo Pty Ltd
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-jobs.rst

@@ -9,7 +9,7 @@ Determine optimal parallel job count for builds
 :Author: drgeoffathome@gmail.com
 :Date:   2017-04-28
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-list-backends.rst

@@ -8,7 +8,7 @@ List available build backends
 
 :Author: drgeoffathome@gmail.com
 :Date:   2026-03-31
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-list-variants.rst

@@ -9,7 +9,7 @@ List available build variants
 :Author: drgeoffathome@gmail.com
 :Date:   2016-08-16
 :Copyright: Copyright (C) 2011-2016 Zomojo Pty Ltd
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-lock-helper.rst

@@ -8,7 +8,7 @@ Helper for file locking during concurrent compilation
 
 :Author: drgeoffathome@gmail.com
 :Date:   2024-01-01
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-magicflags.rst

@@ -9,7 +9,7 @@ Show the magic flags / magic comments that a file exports
 :Author: drgeoffathome@gmail.com
 :Date:   2018-02-23
 :Copyright: Copyright (C) 2011-2018 Zomojo Pty Ltd
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-release.rst

@@ -8,7 +8,7 @@ Automated version bump + build + publish for compiletools
 
 :Author: drgeoffathome@gmail.com
 :Date:   2025-11-26
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-timing-report.rst

@@ -8,7 +8,7 @@ Analyze and display build timing reports
 
 :Author: drgeoffathome@gmail.com
 :Date:   2026-04-06
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-trim-cache.rst

@@ -8,7 +8,7 @@ Trim stale entries from shared object and PCH caches
 
 :Author: drgeoffathome@gmail.com
 :Date:   2026-04-21
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.ct-watch-build.rst

@@ -8,7 +8,7 @@ Continuous rebuild helper that watches sources with inotify
 
 :Author: drgeoffathome@gmail.com
 :Date:   2025-11-26
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/README.profile-ct-cake-worktree.rst

@@ -8,7 +8,7 @@ Safely profile ct-cake performance using temporary git worktrees
 
 :Author: drgeoffathome@gmail.com
 :Date:   2025-11-26
-:Version: 8.2.0
+:Version: 8.2.2
 :Manual section: 1
 :Manual group: developers
 

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/apptools.py

@@ -435,13 +435,12 @@ def _extend_includes_using_git_root(args):
 def _add_include_paths_to_flags(args):
     """Add all the include paths to all three compile flags"""
     for path in args.INCLUDE.split():
-        if path is not None:
-            if path not in args.CPPFLAGS.split():
-                args.CPPFLAGS += " -I " + path
-            if path not in args.CFLAGS.split():
-                args.CFLAGS += " -I " + path
-            if path not in args.CXXFLAGS.split():
-                args.CXXFLAGS += " -I " + path
+        if path not in args.CPPFLAGS.split():
+            args.CPPFLAGS += " -I " + path
+        if path not in args.CFLAGS.split():
+            args.CFLAGS += " -I " + path
+        if path not in args.CXXFLAGS.split():
+            args.CXXFLAGS += " -I " + path
 
     if args.verbose >= 6 and len(args.INCLUDE) > 0:
         print("Extra include paths have been appended to the *FLAG variables:")
@@ -890,11 +889,7 @@ def filter_pkg_config_cflags(cflags_str, verbose=0):
 
             # Normalize and check
             normalized_path = os.path.normpath(path)
-            is_system = False
-            for sys_path in system_include_paths:
-                if normalized_path == sys_path:
-                    is_system = True
-                    break
+            is_system = normalized_path in system_include_paths
 
             if is_system:
                 if verbose >= 6:
@@ -1257,7 +1252,7 @@ def _safely_unquote_string(value):
     value = value.strip()
 
     # If the string doesn't look like it has shell quotes, don't process it
-    if not (value.startswith('"') or value.startswith("'")):
+    if not value.startswith(('"', "'")):
         return value
 
     try:
@@ -1274,8 +1269,7 @@ def _safely_unquote_string(value):
                 unquoted.startswith("'") and unquoted.endswith("'")
             ):
                 return _safely_unquote_string(unquoted)
-            else:
-                return unquoted
+            return unquoted
         else:
             # Multiple tokens or parsing issues - return original
             return value

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/build_backend.py

@@ -1303,24 +1303,28 @@ def wrap_compile_with_lock(compile_cmd: str, target: str, args, filesystem_type:
     strategy = compiletools.filesystem_utils.get_lock_strategy(filesystem_type)
 
     # Fast path: use native flock binary for flock strategy (avoids Python startup).
-    # Compile to a temp file then atomically rename — same pattern and same
-    # rationale as locking.atomic_compile (which the helper-mode path below
-    # routes through). DO NOT 'optimize' back to a bare `flock <target>
-    # gcc -o <target>` form: the flock serialises concurrent compiles of
-    # the same target, but link rules read .o files WITHOUT any lock, so a
-    # peer linker would mmap-read a half-written .o under `make -j N` or
-    # two concurrent ct-cake invocations on the same objdir, producing
-    # sporadic 'undefined reference to main' / 'undefined symbol' errors.
-    # Temp+rename eliminates the race for all readers without needing
-    # read-side locks. The flock keeps a deterministic ".compiletools.tmp"
-    # suffix collision-free across peer writers.
-    # See locking.atomic_compile() for the full DO-NOT-REVERT story.
+    # Two invariants must hold under concurrent peer makes on a shared objdir:
+    #   1. Lock on a SIDECAR ``<target>.lock`` file, NOT on ``<target>``. flock
+    #      opens its lock argument with O_RDWR|O_CREAT, so locking the target
+    #      directly would create an empty ``<target>`` with mtime=now BEFORE
+    #      the inner compile runs. A peer make's mtime check then treats the
+    #      target as up-to-date and skips the compile recipe entirely, going
+    #      straight to link — producing ``undefined reference to 'main'``
+    #      errors. Locking a sidecar leaves ``<target>`` untouched until the
+    #      mv lands, so peer makes see ``<target>`` only when it is complete.
+    #   2. Compile to a temp file then atomically rename — protects link rules
+    #      that read .o files WITHOUT any lock. Without temp+rename a peer
+    #      linker could mmap-read a half-written .o.
+    # DO NOT 'optimize' back to ``flock <target> gcc -o <target>``: that form
+    # violates BOTH invariants. See locking.atomic_compile() for the rationale
+    # the helper-mode path below relies on.
     if strategy == "flock" and _native_flock_available():
         target_q = shlex.quote(target)
+        lock_q = shlex.quote(f"{target}.lock")
         temp_q = shlex.quote(f"{target}.compiletools.tmp")
         # $$ escapes to $ at Make-recipe expansion so the shell sees $? / $ec.
         inner = f"{compile_cmd} -o {temp_q} && mv -f {temp_q} {target_q}; ec=$$?; rm -f {temp_q}; exit $$ec"
-        return f"flock {target_q} sh -c {shlex.quote(inner)}"
+        return f"flock {lock_q} sh -c {shlex.quote(inner)}"
 
     env_prefix = _build_lock_env_prefix(strategy, args, filesystem_type)
     return f"{env_prefix}ct-lock-helper compile --target={target} --strategy={strategy} -- {compile_cmd}"
@@ -1352,9 +1356,15 @@ def wrap_link_with_lock(link_cmd: str, target: str, args, filesystem_type: str)
 
     strategy = compiletools.filesystem_utils.get_lock_strategy(filesystem_type)
 
-    # Fast path: use native flock binary for flock strategy (avoids Python startup)
+    # Fast path: use native flock binary for flock strategy (avoids Python startup).
+    # Lock on ``<target>.lock`` sidecar, NOT on ``<target>``: ``flock`` opens
+    # its lock argument with O_CREAT, which would create an empty ``<target>``
+    # with mtime=now and trick a peer make process into treating the target
+    # as up-to-date (mtime newer than its prerequisites). See
+    # wrap_compile_with_lock for the full rationale.
     if strategy == "flock" and _native_flock_available():
-        return f"flock {target} {link_cmd}"
+        lock_q = shlex.quote(f"{target}.lock")
+        return f"flock {lock_q} {link_cmd}"
 
     env_prefix = _build_lock_env_prefix(strategy, args, filesystem_type)
     return f"{env_prefix}ct-lock-helper link --target={target} --strategy={strategy} -- {link_cmd}"

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/build_context.py

@@ -61,7 +61,6 @@ class BuildContext:
         self.analyzer_args: argparse.Namespace | None = None
         self.file_reading_strategy: str | None = None
         self.warned_low_ulimit: bool = False
-        self.warned_mmap_failure: bool = False
         self.analyze_file_cache: dict[str, FileAnalysisResult] = {}
 
         # -- build timer --

{compiletools-8.2.0 → compiletools-8.2.2}/src/compiletools/cake.py

@@ -1,13 +1,17 @@
 import os
+import shlex
 import shutil
 import signal
+import subprocess
 import sys
+from typing import Optional
 
 import compiletools.apptools
 import compiletools.compilation_database
 import compiletools.configutils
 import compiletools.filelist
 import compiletools.findtargets
+import compiletools.git_utils
 import compiletools.headerdeps
 import compiletools.hunter
 import compiletools.jobs
@@ -48,10 +52,10 @@ class Cake:
             backend=getattr(args, "backend", "make"),
         )
 
-        self.namer = None
-        self.headerdeps = None
-        self.magicparser = None
-        self.hunter = None
+        self.namer: Optional[compiletools.namer.Namer] = None
+        self.headerdeps: Optional[compiletools.headerdeps.HeaderDepsBase] = None
+        self.magicparser: Optional[compiletools.magicflags.MagicFlagsBase] = None
+        self.hunter: Optional[compiletools.hunter.Hunter] = None
 
     @staticmethod
     def _hide_makefilename(args):
@@ -197,6 +201,7 @@ class Cake:
         )
 
     def _callfilelist(self):
+        assert self.hunter is not None
         filelist = compiletools.filelist.Filelist(self.args, self.hunter, style="flat")
         filelist.process()
 
@@ -210,6 +215,10 @@ class Cake:
             # so is wasted work and confuses tooling that picks it up.
             return
 
+        assert self.namer is not None
+        assert self.headerdeps is not None
+        assert self.magicparser is not None
+        assert self.hunter is not None
         # Reuse existing objects to avoid duplicating work
         creator = compiletools.compilation_database.CompilationDatabaseCreator(
             self.args,
@@ -222,6 +231,7 @@ class Cake:
         creator.write_compilation_database()
 
     def _copyexes(self):
+        assert self.namer is not None
         # Copy the executables into the "bin" dir (as per cake)
         # Unless the user has changed the bindir (or set --output)
         # in which case assume that they know what they are doing
@@ -268,6 +278,7 @@ class Cake:
 
     def _clean_topbindir(self):
         """Remove copied executables from the top-level bin directory."""
+        assert self.namer is not None
         if self.args.output:
             try:
                 os.remove(self.args.output)
@@ -285,6 +296,9 @@ class Cake:
 
     def _call_backend(self):
         """Dispatch to the selected build backend."""
+        assert self.namer is not None
+        assert self.hunter is not None
+        assert self.context.timer is not None
         timer = self.context.timer
         backend_name = getattr(self.args, "backend", "make")
         BackendClass = get_backend_class(backend_name)
@@ -319,6 +333,7 @@ class Cake:
         """Transform the arguments into suitable versions for ct-* tools
         and call the appropriate tool.
         """
+        assert self.context.timer is not None
         timer = self.context.timer
         try:
             # If the user specified only a single file to be turned into a library, guess that
@@ -328,6 +343,7 @@ class Cake:
 
             with timer.phase("target_discovery"):
                 self._createctobjs()
+                assert self.hunter is not None
                 recreateobjs = False
                 if self.args.static and len(self.args.static) == 1:
                     self.args.static.extend(self.hunter.required_source_files(self.args.static[0]))
@@ -368,6 +384,8 @@ class Cake:
 
     def clear_cache(self):
         """Only useful in test scenarios where you need to reset to a pristine state"""
+        assert self.namer is not None
+        assert self.hunter is not None
         compiletools.wrappedos.clear_cache()
         compiletools.utils.clear_cache()
         compiletools.git_utils.clear_cache()
@@ -471,9 +489,29 @@ def main(argv=None):
         cake.process()
         # For testing purposes, clear out the memcaches for the times when main is called more than once.
         cake.clear_cache()
+    except subprocess.CalledProcessError as cpe:
+        if args.verbose < 2:
+            cmd = cpe.cmd
+            if isinstance(cmd, (list, tuple)):
+                cmd_str = shlex.join(cmd)
+            else:
+                cmd_str = str(cmd)
+            print(f"Command failed (exit {cpe.returncode}): {cmd_str}", file=sys.stderr)
+            if cpe.stderr:
+                stderr = cpe.stderr.decode() if isinstance(cpe.stderr, bytes) else cpe.stderr
+                print(stderr, file=sys.stderr)
+            elif cpe.output:
+                output = cpe.output.decode() if isinstance(cpe.output, bytes) else cpe.output
+                print(output, file=sys.stderr)
+            return 1
+        else:
+            raise
     except OSError as ioe:
         if args.verbose < 2:
-            print(f"Error processing {ioe.filename}: {ioe.strerror}")
+            if ioe.filename:
+                print(f"Error processing {ioe.filename}: {ioe.strerror}", file=sys.stderr)
+            else:
+                print(f"Error: {ioe.strerror or ioe}", file=sys.stderr)
             return 1
         else:
             raise