From b3f50653a32ee3d398d141280cdc9d7f93402ed0 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 17 Aug 2021 17:26:41 +0100 Subject: [PATCH] nailing-cargo: Properly handle renamed packages Signed-off-by: Ian Jackson --- nailing-cargo | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nailing-cargo b/nailing-cargo index e04c6a5..9724783 100755 --- a/nailing-cargo +++ b/nailing-cargo @@ -542,11 +542,12 @@ sub calculate () { my ($toml, $mf_org_subdir) = @{ $manifests{$mf} }; foreach my $deps (get_dependency_tables $toml) { next unless $deps; - foreach my $p (keys %packagemap) { - my $info = $deps->{$p}; - next unless defined $info; + foreach my $dep_key (keys %$deps) { + my $info = $deps->{$dep_key}; + my $p = (ref $info ? $info->{package} : undef) // $dep_key; + next unless defined $packagemap{$p}; next if $packagemap{$p}[1] eq $mf_org_subdir; - $deps->{$p} = $info = { } unless ref $info; # was just version + $deps->{$dep_key} = $info = { } unless ref $info; # was just version my $oldpath = $info->{path}; delete $info->{version}; my $newpath = $worksphere.'/'.$packagemap{$p}[0]; -- 2.30.2