| 1 |
Author: genone |
| 2 |
Date: 2008-09-28 23:02:25 +0000 (Sun, 28 Sep 2008) |
| 3 |
New Revision: 11597 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/doc/config/sets.docbook |
| 7 |
main/trunk/pym/portage/sets/dbapi.py |
| 8 |
Log: |
| 9 |
remove the 'repository' option from CategorySet in favor of the generic 'intersect' option |
| 10 |
|
| 11 |
Modified: main/trunk/doc/config/sets.docbook |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/doc/config/sets.docbook 2008-09-28 22:55:35 UTC (rev 11596) |
| 14 |
+++ main/trunk/doc/config/sets.docbook 2008-09-28 23:02:25 UTC (rev 11597) |
| 15 |
@@ -123,8 +123,8 @@ |
| 16 |
[installed category packages] |
| 17 |
class = portage.sets.dbapi.CategorySet |
| 18 |
multiset = true |
| 19 |
- repository = vartree |
| 20 |
name_pattern = $category/* |
| 21 |
+ intersect = installed |
| 22 |
</programlisting> |
| 23 |
</para> |
| 24 |
<!-- TODO: reference list of available set handler classes here --> |
| 25 |
@@ -437,13 +437,6 @@ |
| 26 |
<listitem><varname>category</varname>: Required. The name of an existing ebuild |
| 27 |
category which should be used to create the package set. |
| 28 |
</listitem> |
| 29 |
- <listitem><varname>repository</varname>: Optional, defaults to |
| 30 |
- <parameter>porttree</parameter>. It determines which repository class should |
| 31 |
- be used to create the package set. Valid values for this option are: |
| 32 |
- <parameter>porttree</parameter> (normal ebuild repository), |
| 33 |
- <parameter>vartree</parameter> (installed package repository) |
| 34 |
- and <parameter>bintree</parameter> (local binary package repository). |
| 35 |
- </listitem> |
| 36 |
<listitem><varname>only_visible</varname>: Optional, defaults to <parameter>true</parameter>. |
| 37 |
When set to <parameter>true</parameter> the set will only include visible packages, |
| 38 |
when set to <parameter>false</parameter> it will also include masked packages. |
| 39 |
@@ -523,6 +516,9 @@ |
| 40 |
values that must not be contained within the specified |
| 41 |
variable. |
| 42 |
</listitem> |
| 43 |
+ <listitem><varname>metadata-source</varname>: Optional, defaults to |
| 44 |
+ "vartree". Specifies the repository to use for getting the metadata |
| 45 |
+ to check.</listitem> |
| 46 |
</itemizedlist> |
| 47 |
</para> |
| 48 |
</sect2> |
| 49 |
|
| 50 |
Modified: main/trunk/pym/portage/sets/dbapi.py |
| 51 |
=================================================================== |
| 52 |
--- main/trunk/pym/portage/sets/dbapi.py 2008-09-28 22:55:35 UTC (rev 11596) |
| 53 |
+++ main/trunk/pym/portage/sets/dbapi.py 2008-09-28 23:02:25 UTC (rev 11597) |
| 54 |
@@ -201,13 +201,6 @@ |
| 55 |
myatoms.append(cp) |
| 56 |
self._setAtoms(myatoms) |
| 57 |
|
| 58 |
- def _builderGetRepository(cls, options, repositories): |
| 59 |
- repository = options.get("repository", "porttree") |
| 60 |
- if not repository in repositories: |
| 61 |
- raise SetConfigError("invalid repository class '%s'" % repository) |
| 62 |
- return repository |
| 63 |
- _builderGetRepository = classmethod(_builderGetRepository) |
| 64 |
- |
| 65 |
def _builderGetVisible(cls, options): |
| 66 |
return get_boolean(options, "only_visible", True) |
| 67 |
_builderGetVisible = classmethod(_builderGetVisible) |
| 68 |
@@ -220,10 +213,9 @@ |
| 69 |
if not category in settings.categories: |
| 70 |
raise SetConfigError("invalid category name '%s'" % category) |
| 71 |
|
| 72 |
- repository = cls._builderGetRepository(options, trees.keys()) |
| 73 |
visible = cls._builderGetVisible(options) |
| 74 |
|
| 75 |
- return CategorySet(category, dbapi=trees[repository].dbapi, only_visible=visible) |
| 76 |
+ return CategorySet(category, dbapi=trees["porttree"].dbapi, only_visible=visible) |
| 77 |
singleBuilder = classmethod(singleBuilder) |
| 78 |
|
| 79 |
def multiBuilder(cls, options, settings, trees): |
| 80 |
@@ -237,7 +229,6 @@ |
| 81 |
else: |
| 82 |
categories = settings.categories |
| 83 |
|
| 84 |
- repository = cls._builderGetRepository(options, trees.keys()) |
| 85 |
visible = cls._builderGetVisible(options) |
| 86 |
name_pattern = options.get("name_pattern", "$category/*") |
| 87 |
|
| 88 |
@@ -245,7 +236,7 @@ |
| 89 |
raise SetConfigError("name_pattern doesn't include $category placeholder") |
| 90 |
|
| 91 |
for cat in categories: |
| 92 |
- myset = CategorySet(cat, trees[repository].dbapi, only_visible=visible) |
| 93 |
+ myset = CategorySet(cat, trees["porttree"].dbapi, only_visible=visible) |
| 94 |
myname = name_pattern.replace("$category", cat) |
| 95 |
myname = myname.replace("${category}", cat) |
| 96 |
rValue[myname] = myset |
Archives