From b1fb4e1ba4986b4a6393e9b238a4f611c00c9bbf Mon Sep 17 00:00:00 2001 From: Damian Szuberski Date: Wed, 20 Apr 2022 22:43:42 +0200 Subject: [PATCH] rpm -> deb doesn't fail when optional packages are missing Reviewed-by: Brian Behlendorf Signed-off-by: szubersk Closes #13331 Closes #13336 --- config/deb.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/deb.am b/config/deb.am index 65aa70687b..0033dd7591 100644 --- a/config/deb.am +++ b/config/deb.am @@ -61,8 +61,8 @@ deb-utils: deb-local rpm-utils-initramfs pkg7=$${name}-test-$${version}.$${arch}.rpm; \ pkg8=$${name}-dracut-$${version}.noarch.rpm; \ pkg9=$${name}-initramfs-$${version}.$${arch}.rpm; \ - pkg10=`ls python*-pyzfs-$${version}* | tail -1`; \ - pkg11=pam_zfs_key-$${version}.$${arch}.rpm; \ + pkg10=`ls python3-pyzfs-$${version}.noarch.rpm 2>/dev/null`; \ + pkg11=`ls pam_zfs_key-$${version}.$${arch}.rpm 2>/dev/null`; \ ## Arguments need to be passed to dh_shlibdeps. Alien provides no mechanism ## to do this, so we install a shim onto the path which calls the real ## dh_shlibdeps with the required arguments.