Re: [gentoo-portage-dev] [PATCH] _dep_check_composite_db: select highest in slot conflict (bug 554070)

2017-01-04 Thread Zac Medico 
On 01/04/2017 02:28 PM, Brian Dolbec wrote:
> On Tue,  3 Jan 2017 17:13:25 -0800
> Zac Medico  wrote:
> 
>> Fix the _dep_check_composite_db._visible method to select the highest
>> version involved in a slot conflict, for consistency with the change
>> in ab07ac68fa1e04ed64e2e0f6c753ff169a32d517. The included unit test
>> fails without this fix.
>>
>> Fixes: ab07ac68fa1e ("depgraph: select highest version involved in
>> slot conflict (bug 554070)") X-Gentoo-Bug: 554070
>> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=554070
>> ---
>>  pym/_emerge/depgraph.py|   8 +-
>>  .../resolver/test_imagemagick_graphicsmagick.py| 104
>> + 2 files changed, 110 insertions(+), 2
>> deletions(-) create mode 100644
>> pym/portage/tests/resolver/test_imagemagick_graphicsmagick.py
>>
> 
> 
> LGTM
> 

Thanks, merged:

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

Re: [gentoo-portage-dev] [PATCH] repoman: make unused local USE flags an error

2017-01-04 Thread Brian Dolbec 
On Wed,  4 Jan 2017 13:14:38 -0500
Mike Gilbert  wrote:

> X-Gentoo-Bug: 602002
> X-Gentoo-Bug-URL: https://bugs.gentoo.org/602002
> ---
>  repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py
> b/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py index
> 9e4d6cb93..92c74e6f8 100644 ---
> a/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py +++
> b/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py @@ -166,7
> +166,7 @@ class PkgMetadata(ScanBase, USEFlagChecks): if valid_state:
>   for myflag in
> self.muselist.difference(self.usedUseFlags): self.qatracker.add_error(
> - "metadata.warning",
> + "metadata.bad",
>   "%s/metadata.xml: unused
> local USE-description: '%s'" % (xpkg, myflag))
>   return False


Thanks, looks good.
-- 
Brian Dolbec

Re: [gentoo-portage-dev] [PATCH] _dep_check_composite_db: select highest in slot conflict (bug 554070)

2017-01-04 Thread Brian Dolbec 
On Tue,  3 Jan 2017 17:13:25 -0800
Zac Medico  wrote:

> Fix the _dep_check_composite_db._visible method to select the highest
> version involved in a slot conflict, for consistency with the change
> in ab07ac68fa1e04ed64e2e0f6c753ff169a32d517. The included unit test
> fails without this fix.
> 
> Fixes: ab07ac68fa1e ("depgraph: select highest version involved in
> slot conflict (bug 554070)") X-Gentoo-Bug: 554070
> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=554070
> ---
>  pym/_emerge/depgraph.py|   8 +-
>  .../resolver/test_imagemagick_graphicsmagick.py| 104
> + 2 files changed, 110 insertions(+), 2
> deletions(-) create mode 100644
> pym/portage/tests/resolver/test_imagemagick_graphicsmagick.py
> 


LGTM
-- 
Brian Dolbec

[gentoo-portage-dev] [PATCH] repoman: make unused local USE flags an error

2017-01-04 Thread Mike Gilbert 
X-Gentoo-Bug: 602002
X-Gentoo-Bug-URL: https://bugs.gentoo.org/602002
---
 repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py 
b/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py
index 9e4d6cb93..92c74e6f8 100644
--- a/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py
+++ b/repoman/pym/repoman/modules/scan/metadata/pkgmetadata.py
@@ -166,7 +166,7 @@ class PkgMetadata(ScanBase, USEFlagChecks):
if valid_state:
for myflag in 
self.muselist.difference(self.usedUseFlags):
self.qatracker.add_error(
-   "metadata.warning",
+   "metadata.bad",
"%s/metadata.xml: unused local 
USE-description: '%s'"
% (xpkg, myflag))
return False
-- 
2.11.0