On Tue, 5 Dec 2017 08:42:43 -0800
Brian Dolbec <dol...@gentoo.org> wrote:

> On Tue,  5 Dec 2017 17:34:23 +0100
> Michał Górny <mgo...@gentoo.org> wrote:
> 
> > Closes: https://bugs.gentoo.org/615620
> > ---
> >  pym/portage/checksum.py | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > diff --git a/pym/portage/checksum.py b/pym/portage/checksum.py
> > index 5424ce56b..0841ab231 100644
> > --- a/pym/portage/checksum.py
> > +++ b/pym/portage/checksum.py
> > @@ -150,7 +150,10 @@ if "SHA3_256" not in hashfunc_map or "SHA3_512"
> > not in hashfunc_map: # (GnuPG).
> >  gcrypt_algos = frozenset(('RMD160', 'WHIRLPOOL', 'SHA3_256',
> > 'SHA3_512', 'STREEBOG256', 'STREEBOG512'))
> > -if gcrypt_algos.difference(hashfunc_map):
> > +# Note: currently disabled due to resource exhaustion bugs in
> > pygcrypt. +# Please do not reenable until upstream has a fix.
> > +# https://bugs.gentoo.org/615620
> > +if False and gcrypt_algos.difference(hashfunc_map):
> >     try:
> >             import binascii
> >             import pygcrypt.hashcontext  
> 
> 
> 
> It would be better to just comment out the original if, then add a new
> line to replace it with just if False.  it would be clearer what the
> original code should be.  Of course with the reason comments...
> 

sorry, brain is still struggling with this damn headache...

It would be clearer later when re-enabling if it takes a long time 
for pygrcrypt to get fixed.  I know it would be for me, my memory 
isn't as good as it used to be. Also if it ends up someone else 
looks to modify it later.

+# Note: currently disabled due to resource exhaustion bugs in pygcrypt. 
+# Please do not reenable until upstream has a fix. 
+# https://bugs.gentoo.org/615620 
-if gcrypt_algos.difference(hashfunc_map):
+#if gcrypt_algos.difference(hashfunc_map):
+if False
        try:
                import binascii
                import pygcrypt.hashcontext  


I approve the above form to merge...  Thanks
-- 
Brian Dolbec <dolsen>


Reply via email to