From c4a43ea0f9ce18c18216d51df3076e21716219a4 Mon Sep 17 00:00:00 2001 From: Johannes Schauer Marin Rodrigues Date: Mon, 29 Nov 2021 21:15:59 +0100 Subject: [PATCH] make $@ local, so we don't print "Can't locate Dpkg/Vendor/Debian.pm" in other parts where we evaluate $@ --- mmdebstrap | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mmdebstrap b/mmdebstrap index 0e7cc5f..db93bcc 100755 --- a/mmdebstrap +++ b/mmdebstrap @@ -3794,6 +3794,9 @@ sub get_keyring_by_suite { my $debianvendor; my $ubuntuvendor; + # make $@ local, so we don't print "Can't locate Dpkg/Vendor/Debian.pm" + # in other parts where we evaluate $@ + local $@ = ''; eval { require Dpkg::Vendor::Debian; require Dpkg::Vendor::Ubuntu; @@ -3913,6 +3916,9 @@ sub get_sourceslist_by_suite { # https://lists.debian.org/87r26wqr2a.fsf@43-1.org my $bullseye_or_later = 0; my $distro_info = '/usr/share/distro-info/debian.csv'; + # make $@ local, so we don't print "Can't locate Debian/DistroInfo.pm" + # in other parts where we evaluate $@ + local $@ = ''; eval { require Debian::DistroInfo; }; if (!$@) { # libdistro-info-perl is installed