nailing-cargo: Bugfixes etc.

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

diff --git a/nailing-cargo b/nailing-cargo
index 1b6a303cf632cfc2f0e9c18b73398a023f782b94..0d119a29132eb826150134c19894d04c1b0e049e 100755 (executable)
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -48,7 +48,7 @@ use File::Compare;
 my $self = $0;  $self =~ s{^.*/(?=.)}{};
 
 our $worksphere = getcwd() // die "$self: getcwd failed: $!\n";
-$worksphere =~ s{/[^/]+}{} or die "$self: cwd \`$worksphere' unsupported!\n";
+$worksphere =~ s{/[^/]+$}{} or die "$self: cwd \`$worksphere' unsupported!\n";
 our $lockfile = "../.nailing-cargo-sphere.lock";
 
 our @configs;
@@ -205,7 +205,7 @@ sub calculate () {
                next unless $info;
                $info = { } unless ref $info;
                delete $info->{version};
-               $info->{path} = $packagemap{$p};
+               $info->{path} = $worksphere.'/'.$packagemap{$p};
            }
        }
        my $nailing = "$mf.nailing~";