Re: [gentoo-portage-dev] [PATCH] repos.conf: support strict-misc-digests attribute (bug 600128)

2016-11-24 Thread Robin H. Johnson 

On Wed, Nov 23, 2016 at 11:04:54PM -0800, Zac Medico wrote:
> The current GLEP 60 draft specifies that non-strict handling of MISC
> digests should be supported.
In my followup post about how it should work, I noted that in non-strict
mode, a non-fatal warning should be issued for the mismatch of Manifest
and existing MISC file.

You take the approach here of just not checking the MISC files, with a
default of checking them anyway.

The non-fatal warning variant enables keeping the check enabled without
breaking the tree.

Do I need to codify that into a GLEP update to get traction?

-- 
Robin Hugh Johnson
Gentoo Linux: Dev, Infra Lead, Foundation Trustee & Treasurer
E-Mail   : robb...@gentoo.org
GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85
GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136

Re: [gentoo-portage-dev] [PATCH] unpack: fix txz unpack support (bug 600660)

2016-11-24 Thread Brian Dolbec 
On Thu, 24 Nov 2016 10:46:21 -0800
Zac Medico  wrote:

> Since txz unpack support was added in commit
> daa65a336102050396482f08c77524fe99e48c9f, it has been non-functional,
> as follows:
> 
> phase-helpers.sh: line 521: ___eapi_supports_txz: command not found
> unpack portage-2.3.2.txz: file format not recognized. Ignoring.
> 
> Fixes: daa65a336102 ("Add tentative EAPI6 .txz unpack support")
> X-Gentoo-Bug: 600660
> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=600660
> ---
>  bin/phase-helpers.sh | 7 +--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
> index d55165c..9e4e6a2 100644
> --- a/bin/phase-helpers.sh
> +++ b/bin/phase-helpers.sh
> @@ -518,8 +518,11 @@ unpack() {
>   "suffix '${suffix}'
> which is unofficially supported" \ "with EAPI '${EAPI}'. Instead use
> 'txz'." fi
> - if ___eapi_supports_txz; then
> - __unpack_tar "xz -d" ||
> return 1
> + if ___eapi_unpack_supports_txz; then
> + if ! tar xof "$srcdir$x";
> then
> + __helpers_die
> "$myfail"
> + return 1
> + fi
>   else
>   __vecho "unpack ${x}: file
> format not recognized. Ignoring." fi

looks good, thanks

-- 
Brian Dolbec

[gentoo-portage-dev] [PATCH] unpack: fix txz unpack support (bug 600660)

2016-11-24 Thread Zac Medico 
Since txz unpack support was added in commit
daa65a336102050396482f08c77524fe99e48c9f, it has been non-functional,
as follows:

phase-helpers.sh: line 521: ___eapi_supports_txz: command not found
unpack portage-2.3.2.txz: file format not recognized. Ignoring.

Fixes: daa65a336102 ("Add tentative EAPI6 .txz unpack support")
X-Gentoo-Bug: 600660
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=600660
---
 bin/phase-helpers.sh | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index d55165c..9e4e6a2 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -518,8 +518,11 @@ unpack() {
"suffix '${suffix}' which is 
unofficially supported" \
"with EAPI '${EAPI}'. Instead 
use 'txz'."
fi
-   if ___eapi_supports_txz; then
-   __unpack_tar "xz -d" || return 1
+   if ___eapi_unpack_supports_txz; then
+   if ! tar xof "$srcdir$x"; then
+   __helpers_die "$myfail"
+   return 1
+   fi
else
__vecho "unpack ${x}: file format not 
recognized. Ignoring."
fi
-- 
2.7.4

Re: [gentoo-portage-dev] [PATCH] repos.conf: support strict-misc-digests attribute (bug 600128)

2016-11-24 Thread Zac Medico 
On 11/24/2016 12:14 AM, Brian Dolbec wrote:
> On Wed, 23 Nov 2016 23:04:54 -0800
> Zac Medico  wrote:
> 
>> This setting determines whether digests are checked for files declared
>> in the Manifest with MISC type (includes ChangeLog and metadata.xml
>> files). Defaults to true.
>>
>> The current GLEP 60 draft specifies that non-strict handling of MISC
>> digests should be supported.
>>
>> X-Gentoo-Bug: 600128
>> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=600128
>> ---
>>  man/portage.5 |  9 -
>>  pym/portage/manifest.py   |  6 --
>>  pym/portage/package/ebuild/digestcheck.py |  2 +-
>>  pym/portage/repository/config.py  | 18 ++
>>  4 files changed, 27 insertions(+), 8 deletions(-)
>>
> 
> LGTM
> 

Thanks, pushed:

https://gitweb.gentoo.org/proj/portage.git/commit/?id=f8b1d840de9ffd9aa86dc8666d8915826ffa0f63
-- 
Thanks,
Zac

Re: [gentoo-portage-dev] [PATCH] repos.conf: support strict-misc-digests attribute (bug 600128)

2016-11-24 Thread Brian Dolbec 
On Wed, 23 Nov 2016 23:04:54 -0800
Zac Medico  wrote:

> This setting determines whether digests are checked for files declared
> in the Manifest with MISC type (includes ChangeLog and metadata.xml
> files). Defaults to true.
> 
> The current GLEP 60 draft specifies that non-strict handling of MISC
> digests should be supported.
> 
> X-Gentoo-Bug: 600128
> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=600128
> ---
>  man/portage.5 |  9 -
>  pym/portage/manifest.py   |  6 --
>  pym/portage/package/ebuild/digestcheck.py |  2 +-
>  pym/portage/repository/config.py  | 18 ++
>  4 files changed, 27 insertions(+), 8 deletions(-)
> 

LGTM

-- 
Brian Dolbec