diff options
| author | Damian Szuberski <[email protected]> | 2022-04-20 22:43:42 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-04-20 13:43:42 -0700 |
| commit | b1fb4e1ba4986b4a6393e9b238a4f611c00c9bbf (patch) | |
| tree | 24e2347fc05592195f6ade0547f2b91187c83e64 | |
| parent | 92295af8004b07a58e0860d66dd565143486a757 (diff) | |
rpm -> deb doesn't fail when optional packages are missing
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: szubersk <[email protected]>
Closes #13331
Closes #13336
| -rw-r--r-- | config/deb.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/deb.am b/config/deb.am index 65aa70687..0033dd759 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. |