From d554c0b469b6059b0eac3e9b97e2b878c862a009 Mon Sep 17 00:00:00 2001 From: Johannes Schauer Marin Rodrigues Date: Mon, 23 Jan 2023 15:01:21 +0100 Subject: [PATCH] de-duplicate FAKECHROOT_CMD_SUBST variable --- mmdebstrap | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mmdebstrap b/mmdebstrap index ca20d2d..de875d2 100755 --- a/mmdebstrap +++ b/mmdebstrap @@ -2602,20 +2602,23 @@ sub run_prepare { $subst{ldconfig} = '/usr/libexec/mmdebstrap/ldconfig.fakechroot'; } - my @fakechrootsubst = (); + my %fakechrootsubst; foreach my $d (split ':', $ENV{PATH}) { - foreach my $k (sort keys %subst) { + foreach my $k (sort %subst) { if (-e "$d/$k") { - push @fakechrootsubst, "$d/$k=$subst{$k}"; + $fakechrootsubst{"$d/$k=$subst{$k}"} = 1; } } } if (defined $ENV{FAKECHROOT_CMD_SUBST} && $ENV{FAKECHROOT_CMD_SUBST} ne "") { - push @fakechrootsubst, split /:/, $ENV{FAKECHROOT_CMD_SUBST}; + foreach my $e (split /:/, $ENV{FAKECHROOT_CMD_SUBST}) { + $fakechrootsubst{$e} = 1; + } } ## no critic (Variables::RequireLocalizedPunctuationVars) - $ENV{FAKECHROOT_CMD_SUBST} = join ':', @fakechrootsubst; + $ENV{FAKECHROOT_CMD_SUBST} = join ':', + (sort keys %fakechrootsubst); } if (defined $ENV{FAKECHROOT_EXCLUDE_PATH} && $ENV{FAKECHROOT_EXCLUDE_PATH} ne "") {