Review comments

Author: spoorcc

CHANGELOG.rst

@@ -13,7 +13,7 @@ Release 0.14.0 (unreleased)
 * Add new ``remove`` command to remove projects from manifest and disk (#26)
 * Fix "unsafe symlink target" error for archives containing relative ``..`` symlinks (#1122)
 * Fix ``dfetch add`` crashing with a ``ValueError`` when the remote URL has a trailing slash (#1137)
-* Fix unhelpful message when a metadata file (#1145)
+* Fix unhelpful error message when a metadata file is malformed (#1145)
 
 Release 0.13.0 (released 2026-03-30)
 ====================================

dfetch/commands/report.py

@@ -50,7 +50,7 @@
 from dfetch.log import get_logger
 from dfetch.manifest.project import ProjectEntry
 from dfetch.project import create_super_project
-from dfetch.project.metadata import Metadata
+from dfetch.project.metadata import InvalidMetadataError, Metadata
 from dfetch.reporting import REPORTERS, ReportTypes
 from dfetch.util.license import (
     LicenseScanResult,
@@ -171,6 +171,6 @@ def _determine_version(project: ProjectEntry) -> str:
                 or project.hash
                 or ""
             )
-        except FileNotFoundError:
+        except (FileNotFoundError, InvalidMetadataError):
             version = project.tag or project.revision or project.hash or ""
         return version

dfetch/project/metadata.py

@@ -16,6 +16,10 @@
 """
 
 
+class InvalidMetadataError(Exception):
+    """Raised when a metadata file exists but cannot be parsed."""
+
+
 class Dependency(TypedDict):
     """Argument types for dependency class construction."""
 
@@ -91,7 +95,9 @@ def from_file(cls, path: str) -> "Metadata":
             try:
                 data: Options = yaml.safe_load(metadata_file)["dfetch"]
             except yaml.YAMLError as exc:
-                raise ValueError(str(exc)) from exc
+                raise InvalidMetadataError(str(exc)) from exc
+            except (KeyError, TypeError) as exc:
+                raise InvalidMetadataError(str(exc)) from exc
 
             return cls(data)
 

dfetch/project/subproject.py

@@ -9,7 +9,7 @@
 from dfetch.manifest.project import ProjectEntry
 from dfetch.manifest.version import Version
 from dfetch.project.abstract_check_reporter import AbstractCheckReporter
-from dfetch.project.metadata import Dependency, Metadata
+from dfetch.project.metadata import Dependency, InvalidMetadataError, Metadata
 from dfetch.util.util import hash_directory, safe_rm
 from dfetch.util.versions import latest_tag_from_list
 from dfetch.vcs.patch import Patch
@@ -348,7 +348,7 @@ def on_disk_version(self) -> Version | None:
 
         try:
             return Metadata.from_file(self.__metadata.path).version
-        except (TypeError, ValueError):
+        except InvalidMetadataError:
             logger.print_warning_line(
                 self.__project.name,
                 f"{pathlib.Path(self.__metadata.path).relative_to(os.getcwd()).as_posix()}"
@@ -367,7 +367,7 @@ def _on_disk_hash(self) -> str | None:
 
         try:
             return Metadata.from_file(self.__metadata.path).hash
-        except (TypeError, ValueError):
+        except InvalidMetadataError:
             logger.print_warning_line(
                 self.__project.name,
                 f"{pathlib.Path(self.__metadata.path).relative_to(os.getcwd()).as_posix()}"

dfetch/reporting/stdout_reporter.py

@@ -70,7 +70,7 @@
 
 from dfetch.log import get_logger
 from dfetch.manifest.project import ProjectEntry
-from dfetch.project.metadata import Metadata
+from dfetch.project.metadata import InvalidMetadataError, Metadata
 from dfetch.reporting.reporter import Reporter
 from dfetch.util.license import LicenseScanResult
 
@@ -119,7 +119,7 @@ def add_project(
                 )
                 logger.info("")
 
-        except FileNotFoundError:
+        except (FileNotFoundError, InvalidMetadataError):
             logger.print_info_field("  last fetch", "never")
 
     def dump_to_file(self, outfile: str) -> bool:

features/handle-invalid-metadata.feature

@@ -1,11 +1,11 @@
-@update
 Feature: Handle invalid metadata files
 
     *Dfetch* will keep metadata about the fetched project locally to prevent re-fetching unchanged projects
     or replacing locally changed projects. Sometimes the metadata file will become incorrect and this should not lead
     to unpredictable behavior in *DFetch*.
     For instance, the metadata may be invalid
 
+    @update
     Scenario: Metadata with invalid YAML syntax is treated as invalid
         Given the manifest 'dfetch.yaml'
             """
@@ -30,6 +30,31 @@ Feature: Handle invalid metadata files
               > Fetched v1
             """
 
+    @check
+    Scenario: Metadata with invalid YAML syntax is treated as invalid during check
+        Given the manifest 'dfetch.yaml'
+            """
+            manifest:
+              version: '0.0'
+
+              projects:
+                - name: ext/test-repo-tag
+                  url: https://github.com/dfetch-org/test-repo
+                  tag: v1
+
+            """
+        And all projects are updated
+        And the metadata file ".dfetch_data.yaml" of "ext/test-repo-tag" has invalid yaml
+        When I run "dfetch check"
+        Then the output shows
+            """
+            Dfetch (0.13.0)
+              ext/test-repo-tag:
+              > ext/test-repo-tag/.dfetch_data.yaml is an invalid metadata file, not checking on disk version!
+              > wanted (v1), available (v2.0)
+            """
+
+    @update
     Scenario: Invalid metadata is ignored
         Given the manifest 'dfetch.yaml'
             """