Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.gentoo.dev > #70450

Re: [gentoo-dev] [PATCH 1/5] rpm.eclass: rework app-arch/rpm support into pre-inherit variable

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

Eli Schwartz <eschwartz@gentoo.org> writes:

> On 4/22/26 12:18 PM, Sam James wrote:
>
>>> +	elif [[ "${#types[@]}" -gt 0 ]]; then
>>> +		for t in "${types[@]}"; do
>>> +			case ${t} in
>>> +				bzip2|zstd) rpmdep+="${t}," ;;
>>> +				lzma) rpmdep+="${t},"; rpm2tar="false" ;;
>>> +				xz) rpmdep+="lzma," ;;
>>> +				none) die "RPM_COMPRESS_TYPE=none must be used alone" ;;
>> 
>> What does alone mean here?
>> 
>> (Add a comment or improve the 'die' message.)
>
>
> die "RPM_COMPRESS_TYPE: 'none' cannot be combined with other values"
>
>
> ?

LGTM.

>
>>> -			# app-arch/rpm fallback
>>> +			payload=$(strings "${a}" | grep -o
>>> 'PayloadIs[a-zA-Z]*'; pipestatus || die "failed to grep rpm payload")
>> 
>> I think this should be $(tc-getSTRINGS), to be pedantic.
>
>
> Yes, oops.
>
>
>
>>> +		if [[ ${use_rpm} = true ]] && has_version -b "app-arch/rpm${usedep}"; then
>>> +			# prefer it if correct USE is in BDEPEND and installed
>>>  			local extracttool=(rpm2archive -n)
>>> +		elif [[ ${payload} = lzma ]]; then
>>> +			die "rpm_unpack called with legacy lzma compression that rpm2targz doesn't support"
>> 
>> It's supposed to, it just doesn't: https://bugs.gentoo.org/321439
>> 
>> (I'd perhaps Bug: tag that.)
>> 
>>> +		else
>>> +			local extracttool=(rpm2tar -O)
>>>  		fi
>>>  
>>>  		"${extracttool[@]}" "${a}" | tar xf -

I think feel free to commit this now. I don't love saying that when
there's an API involved but I don't think we should leave the packages
broken for longer, and nobody has suggested anything different
throughout the IRC discussions either, so I think it's OK.

thanks,
sam

Back to linux.gentoo.dev | Previous | Next — Previous in thread | Next in thread | Find similar

Thread

[gentoo-dev] [PATCH 1/5] rpm.eclass: rework app-arch/rpm support into pre-inherit variable Eli Schwartz <eschwartz@gentoo.org> - 2026-04-22 16:30 +0200
  [gentoo-dev] [PATCH 4/5] x11-themes/leonidas-backgrounds: set rpm.eclass var for reference rpm support Eli Schwartz <eschwartz@gentoo.org> - 2026-04-22 16:30 +0200
  Re: [gentoo-dev] [PATCH 1/5] rpm.eclass: rework app-arch/rpm support  into pre-inherit variable Nowa Ammerlaan <nowa@gentoo.org> - 2026-04-22 17:20 +0200
    Re: [gentoo-dev] [PATCH 1/5] rpm.eclass: rework app-arch/rpm support  into pre-inherit variable Eli Schwartz <eschwartz@gentoo.org> - 2026-04-23 00:20 +0200
  Re: [gentoo-dev] [PATCH 1/5] rpm.eclass: rework app-arch/rpm  support into pre-inherit variable Sam James <sam@gentoo.org> - 2026-04-22 18:20 +0200
    Re: [gentoo-dev] [PATCH 1/5] rpm.eclass: rework app-arch/rpm support  into pre-inherit variable Eli Schwartz <eschwartz@gentoo.org> - 2026-04-23 00:20 +0200
      Re: [gentoo-dev] [PATCH 1/5] rpm.eclass: rework app-arch/rpm  support into pre-inherit variable Sam James <sam@gentoo.org> - 2026-04-23 02:10 +0200
  [gentoo-dev] [PATCH v2 1/5] rpm.eclass: rework app-arch/rpm support into pre-inherit variable Eli Schwartz <eschwartz@gentoo.org> - 2026-04-23 02:50 +0200
    Re: [gentoo-dev] [PATCH v2 1/5] rpm.eclass: rework app-arch/rpm  support into pre-inherit variable Sam James <sam@gentoo.org> - 2026-04-23 03:20 +0200
    Re: [gentoo-dev] [PATCH v2 1/5] rpm.eclass: rework app-arch/rpm  support into pre-inherit variable Nicolas PARLANT <nicolas.parlant@parhuet.fr> - 2026-04-23 06:30 +0200
      Re: [gentoo-dev] [PATCH v2 1/5] rpm.eclass: rework app-arch/rpm  support into pre-inherit variable Eli Schwartz <eschwartz@gentoo.org> - 2026-04-23 07:00 +0200
  [gentoo-dev] [PATCH v3 0/5] rpm.eclass: rework app-arch/rpm support into pre-inherit variable Eli Schwartz <eschwartz@gentoo.org> - 2026-04-24 16:50 +0200
    [gentoo-dev] [PATCH v3 4/5] x11-themes/leonidas-backgrounds: set rpm.eclass var for reference rpm support Eli Schwartz <eschwartz@gentoo.org> - 2026-04-24 16:50 +0200
    [gentoo-dev] [PATCH v3 1/5] rpm.eclass: rework app-arch/rpm support into pre-inherit variable Eli Schwartz <eschwartz@gentoo.org> - 2026-04-24 16:50 +0200
    [gentoo-dev] [PATCH v3 3/5] app-backup/tsm: set rpm.eclass var for reference rpm support Eli Schwartz <eschwartz@gentoo.org> - 2026-04-24 16:50 +0200
    [gentoo-dev] [PATCH v3 5/5] rpm.eclass: make RPM_COMPRESS_TYPE mandatory in EAPI 9 Eli Schwartz <eschwartz@gentoo.org> - 2026-04-24 16:50 +0200
    [gentoo-dev] [PATCH v3 2/5] app-office/libreoffice-l10n: set rpm.eclass var for reference rpm support Eli Schwartz <eschwartz@gentoo.org> - 2026-04-24 16:50 +0200

csiph-web