nailing-cargo: Change read_manifest return convention

Now it returns $ws too, which is going to be workspace information.

Right now it's just undef, so no functional change.

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

diff --git a/nailing-cargo b/nailing-cargo
index d18e3ade0c67bf72e72a4f2d991a79d4aa8979f9..dae805cbd19f41d1a2b938c538c84dd861fe82b2 100755 (executable)
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -309,7 +309,7 @@ sub read_manifest ($$$) {
       next;
     }
     $manifests{$manifest} = $toml;
-    return $p;
+    return ($p, undef);
   }
   return undef;
 }
@@ -318,7 +318,8 @@ 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, $subdir, "from [packages]") // '<nothing!>';
+    my ($gotpackage, $ws) = read_manifest($subdir, $subdir, "from [packages]");
+    $gotpackage //= '<nothing!>';
     if ($gotpackage ne $p) {
       print STDERR
  "$self: warning: honouring Cargo.nail packages.$subdir=$p even though $subdir contains package $gotpackage!\n";
@@ -327,7 +328,7 @@ sub readorigs () {
     $packagemap{$p} = $subdir;
   }
   foreach my $subdir (@{ $nail->{subdirs} }) {
-    my $gotpackage = read_manifest($subdir, $subdir, "from [subdirs]");
+    my ($gotpackage,$ws) = read_manifest($subdir, $subdir, "from [subdirs]");
     if (!defined $gotpackage) {
       print STDERR
  "$self: warning: ignoring subdir $subdir which has no (suitable) Cargo.toml\n";