From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 25 Jul 2020 10:36:53 +0000 (+0100)
Subject: nailing-cargo: Pass $why to read_manifest
X-Git-Tag: nailing-cargo/1.0.0~88
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=912d989da9488a8338a45437b28e2bd5556da5c5;p=nailing-cargo.git

nailing-cargo: Pass $why to read_manifest

This will help with error messages.

Not used yet.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/nailing-cargo b/nailing-cargo
index 46d5597..87dd033 100755
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -290,8 +290,8 @@ sub consider_oot () {
 our %manifests;
 our %packagemap;
 
-sub read_manifest ($) {
-  my ($subdir) = @_;
+sub read_manifest ($$) {
+  my ($subdir, $why) = @_;
   my $manifest = "../$subdir/Cargo.toml";
   print STDERR "$self: reading $manifest...\n" if $verbose>=4;
   if (defined $manifests{$manifest}) {
@@ -317,7 +317,7 @@ sub readorigs () {
   foreach my $p (keys %{ $nail->{packages} }) {
     my $v = $nail->{packages}{$p};
     my $subdir = ref($v) ? $v->{subdir} : $v;
-    my $gotpackage = read_manifest($subdir) // '<nothing!>';
+    my $gotpackage = read_manifest($subdir, "from [packages]") // '<nothing!>';
     if ($gotpackage ne $p) {
       print STDERR
  "$self: warning: honouring Cargo.nail packages.$subdir=$p even though $subdir contains package $gotpackage!\n";
@@ -326,7 +326,7 @@ sub readorigs () {
     $packagemap{$p} = $subdir;
   }
   foreach my $subdir (@{ $nail->{subdirs} }) {
-    my $gotpackage = read_manifest($subdir);
+    my $gotpackage = read_manifest($subdir, "from [subdirs]");
     if (!defined $gotpackage) {
       print STDERR
  "$self: warning: ignoring subdir $subdir which has no (suitable) Cargo.toml\n";