Re: [gentoo-portage-dev] [PATCH] repoman: fix KeyError triggered by fetch failure during manifest generation (bug 569942)
On Sun, 27 Dec 2015 18:13:06 -0800 Zac Medicowrote: > Fix Scanner not to override portdbapi._aux_cache_keys when generating > manifests, since spawn_nofetch requires additional keys. > > Fixes: 39d81c514c33 ("[...]config.__getitem__(): Partially drop > backward compatibility for nonexistent keys.") X-Gentoo-Bug: 569942 > X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=569942 > --- > pym/repoman/scanner.py | 10 +++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py > index 9a87f65..d1c10d7 100644 > --- a/pym/repoman/scanner.py > +++ b/pym/repoman/scanner.py > @@ -93,9 +93,13 @@ class Scanner(object): > self.portdb.settings = > self.repo_settings.repoman_settings # We really only need to cache > the metadata that's necessary for visibility # filtering. Anything > else can be discarded to reduce memory consumption. > - self.portdb._aux_cache_keys.clear() > - self.portdb._aux_cache_keys.update( > - ["EAPI", "IUSE", "KEYWORDS", "repository", > "SLOT"]) > + if self.options.mode != "manifest" and > self.options.digest != "y": > + # Don't do this when generating manifests, > since that uses > + # additional keys if spawn_nofetch is called > (RESTRICT and > + # DEFINED_PHASES). > + self.portdb._aux_cache_keys.clear() > + self.portdb._aux_cache_keys.update( > + ["EAPI", "IUSE", "KEYWORDS", > "repository", "SLOT"]) > self.reposplit = myreporoot.split(os.path.sep) > self.repolevel = len(self.reposplit) Tested and confirmed working correctly now :) Thanks. looks good -- Brian Dolbec
Re: [gentoo-portage-dev] [PATCH v2] emerge: Add --autounmask-only parameter
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 LGTM. Thanks for this! - -- Alexander berna...@gentoo.org https://secure.plaimi.net/~alexander -BEGIN PGP SIGNATURE- Version: GnuPG v2 iQIcBAEBCgAGBQJWgmQ1AAoJENQqWdRUGk8B3qwP/itaogbVFoyxXqBHQT1aA0/X WbKMyvBgpRpcfTK6GS4NEVq4AeVorUOPHFcHQFBtLJWyzr/D7CYRf11KVl4AyH0y jSNKVZ+exvrDwCiLbim92yHh66DxyRK/kKRhrhdSb8zwnAD0YyfPGdVkAjLsZ/A2 81itvPHT7WSA0Zf9hLnk5xRq0Wnb60ZoMOBf/4q+tW07lzdQYIS2K/hnIDa/K+Zn 03sZ1ZZgeY5nzpelQNS4YRKjhrZxQmNF6WdbDyYQ/9p9HDsvSSHYjQA0ytzFY5C+ 0iUhMTWR4kq0HW76057J5mOgeoC6FnHHGZIJ4kgmwX+kO70kN+uJ7Px8xKvx9vIz eA8ncFc8uAJ+OIrsi9ehyDv6Ae6Sb3DTzdoIUrG3GEL6gCtCixEDeqBKyKfzCu6n SpN3ykIBH1UdLpOxXRPayXq0V/IAl0k4Q5Xz+qZsmfVxizMtp55y0tgI327eClQn vwKEGtMQplEc8Zc/JXmp2UfWDekbh8CIeEs7FHRnd3V4aYXvMlZsMEO0OESIFXl6 eIVUHSP7hjKbvuCiMQD4U2GEgTRlWqyetkre3SFzlQeUqBJ77ACs6r4xpjJXkMAi W+tsIejIbBgiobj0+UbTjgUlfOZWGolZBCL/cSeM5+B/R6KzE0p8VnX7wptKHQmi ekwfSL50Qwh7QgxwRWld =qG5C -END PGP SIGNATURE-
Re: [gentoo-portage-dev] [PATCH] fs_template.gen_label: handle hash randomization
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 ACK. - -- Alexander berna...@gentoo.org https://secure.plaimi.net/~alexander -BEGIN PGP SIGNATURE- Version: GnuPG v2 iQIcBAEBCgAGBQJWgl+aAAoJENQqWdRUGk8BhiEP/0DYEQbbG7SmnDony8bPJ33c pFZKUAcOogcU1hQDHwrSBEHzbmJhjV3lee/vpVq2KiNC0t5mBy+kZ3W8pxT8TQVV TD6kjG2qO2Pp8oAtpWMe5xJS/q7IS/OYw6KHxvJvM77Qegun8I1B73VfzbZNwKaH 5bdml/UWrbBYfUNk8OeuokWsPEjR1sj+mCjpuwUv8WqZtGlk02q0eA2f95U+GcQu v/q9nSq7dHofI9xsmErcMlz9vi5dr5bLVd3sl3Qy23vT9o9IA/bo79pkZi0/wwpz s3KiApqN8loL3UVBdEzR4N9oSTIOJLwN/bukkJtEm8VgEXazQJk0UzF79N4diTIS xf9rt/reu7BWUmFhzZcfySBKvabzhQvbs57lMSiH66OXmZOKjhidDlgHv+vk2Dnl QYYXqZ7fXP7Db10PEih+m1/xi8RCo/aynG0V+f8cCVei1U5m7Lj3gVHQKS3djZdJ z8u0+4mOrbS7xveFGWgQpok8o04N1OTdJwcXcSZxFA5u1uX0CrN4QHack6C88RkW +DbnXc2AiSyhQfC+dlSevDf6JTXnj/XwhHgd/IzA2R6QXZYGc8B9RoP5dF2y5HWs SC6oqAgkZW0hYs6QOhZ3VJ0SjPRjtzkoTcObtCkW0RdxjZtGK7lBHZMrHvZkpB/7 +ie/UFb7XfP7i8CYYaQl =XwlQ -END PGP SIGNATURE-
Re: [gentoo-portage-dev] [PATCH v2] emerge: Add --autounmask-only parameter
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 I just remembered -- did I not ask you to add a bug for this? Did you? If so, please add it to the commit message -- see the other messages for how. Just add (bug ) to the header, and X-Gentoo-Bug and X-Gentoo-Bug-url to the message. If you did not add a bug, let me know. I will push this once you get me a v3 with an updated commit message, or a NACK on the bug add. - -- Alexander berna...@gentoo.org https://secure.plaimi.net/~alexander -BEGIN PGP SIGNATURE- Version: GnuPG v2 iQIcBAEBCgAGBQJWgmTmAAoJENQqWdRUGk8BaFUP/2NpVkZjLMVnSyw/1On/ek3/ wR6x4jHIrqdnBNUmdQp8OtchlDyffMlzLmuCM1X1TsMlHN9gn9tmzK0VmqLeSjC5 0lG5osLIjdLM4Ge4h3wYtjOTdnUvJpJiFOvPGWi0ptwm5TYwM/H5LnX/yqDe+cU9 7BYj8zzJ8XJFiIrkBqE/FQUqNLNHz2pDt1qwqSq7xX2Z+ojpTXAm+Z5Z9EjigEuh 5jpVQgjP8NreoQUJmXxV3HxGYhsfdjMKcuaMqF5ntXwUNUzP5xerbi9IjWQvX6Mo sGL0U81Ks5Adttp6ex7oasEGstAqVw469PuFmHVpRD9zJhwzCAJSedp1uWXWxEGR t82DlXKk+L4T5bZuIaKEcGkiNhfy8tBPU5s3Z+HSk/JG3w5dIwI/iTU3ajgw7KGB sgv9Q/2G/PhEBIoYXJzEDdRPx17LtOrrStcuFqvKreTBVUneOUMr4HAP1RnvHYMF NRgZBAy6E5B2JgFBWINgkuRjYwvppP9N2dtzPm2pH7MC3+tsn0qGlb1LAdAOWKGa rcABA9viK8g2YcHSPcvb+8QlU8kubkH0NJqw0LO70RNSZh54NmQ1rrgIkVi1ZUmZ BvNUrP14e+SrzK380kYYz0gtG2loFC5APk2HnGP2iNOsqaNKwghzdMg8LL6MhAaN q9utXhEr8upRauKFRSZQ =atND -END PGP SIGNATURE-
Re: [gentoo-portage-dev] [PATCH 2/2] sqlite: enable md5 validation (bug 568934)
-BEGIN PGP SIGNED MESSAGE- Hash: SHA512 These two are eh probably fine. - -- Alexander berna...@gentoo.org https://secure.plaimi.net/~alexander -BEGIN PGP SIGNATURE- Version: GnuPG v2 iQIcBAEBCgAGBQJWgl55AAoJENQqWdRUGk8Bdk0P/1eXVvw6qq2Baz9pOBN39sQ0 WQ2/WSIQYBgGE9lpmCoJUBviB8nzTFC4Yrxt+e6lyRHhYqMCxCOvBL81MG66ChjL /HTSK4Sd6hjcaJUprcwc22NrL4Yiy034U0frmpqOlHZ+Hpe/E4YT9uXwZ+neT/nA J7CtYnoljP4ZrEsrQlYUXiY9nphWN0rier89qYa/Thd+ZlWZc5NsF70D/p4EZIqZ kwf9NqkUxML3pe7WJod7jWt30RTfhrVXw/HEvl6FSwZ01gGDevnpGfcbE4xO+fot nvhrq/hr7z8TYEk9D3KuxcHuTW7wvLr4YWpO55dlzbSzX1mqgpL+2L3/H8dlipve uE9eIVDJPcYpi+X/1ozb0mgkcV8TxEcMJFqAVsmRdayHlUnaGHK0VtmiEVAwuk3Z CwWMedQVrkqU3/sk9DF8N+pKiBraGCTUQxGTiqSPloiRCaPUlWbu26rpOLCTG/cb uLcWcxGvaFkcbm9gHpbbQFwFnOGLLUWN6zjwrs87mWKiwZHNCWrcnVNSFlpf3D0j cAF1CCw8ElZ3M99sQX0xBGBo7a0czSjxmhnExkolDG4TPWfGTF7ixUNIKdr+TIUC Dztz3AvQhhCwEkH3T/CvdFZuvyoGVdd9VXnAVvObSmWJHNDVRNaVNHd+V2dWu/Xx Y4K6M5OmLMrUhvR1+jYL =jZL2 -END PGP SIGNATURE-