[gentoo-commits] portage r11293 - in main/trunk: cnf pym/portage/sets

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-07-31 06:11:18 +0000 (Thu, 31 Jul 2008)
New Revision: 11293

Modified:
   main/trunk/cnf/sets.conf
   main/trunk/pym/portage/sets/dbapi.py
Log:
Add a new @module-rebuild set which emulates the behavior of the
module-rebuild tool. The /lib/modules path is set in sets.conf
via a "files" attribute of an OwnerSet instance. This can be easily
used to define similar sets based on paths on installed files.


Modified: main/trunk/cnf/sets.conf
===================================================================
--- main/trunk/cnf/sets.conf	2008-07-31 05:45:56 UTC (rev 11292)
+++ main/trunk/cnf/sets.conf	2008-07-31 06:11:18 UTC (rev 11293)
@@ -47,3 +47,9 @@
 class = portage.sets.dbapi.InheritSet
 world-candidate = False
 inherits = "cvs darcs git mercurial subversion"
+
+# Installed packages that own files inside /lib/modules.
+[module-rebuild]
+class = portage.sets.dbapi.OwnerSet
+world-candidate = False
+files = /lib/modules

Modified: main/trunk/pym/portage/sets/dbapi.py
===================================================================
--- main/trunk/pym/portage/sets/dbapi.py	2008-07-31 05:45:56 UTC (rev 11292)
+++ main/trunk/pym/portage/sets/dbapi.py	2008-07-31 06:11:18 UTC (rev 11293)
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-from portage.versions import catsplit
+from portage.versions import catpkgsplit, catsplit
 from portage.sets.base import PackageSet
 from portage.sets import SetConfigError, get_boolean
 
@@ -32,6 +32,42 @@
 		return EverythingSet(trees["vartree"].dbapi)
 	singleBuilder = classmethod(singleBuilder)
 
+class OwnerSet(PackageSet):
+
+	_operations = ["merge", "unmerge"]
+
+	description = "Package set which contains all packages " + \
+		"that own one or more files."
+
+	def __init__(self, vardb=None, files=None):
+		super(OwnerSet, self).__init__()
+		self._db = vardb
+		self._files = files
+
+	def mapPathsToAtoms(self, paths):
+		rValue = set()
+		vardb = self._db
+		aux_get = vardb.aux_get
+		aux_keys = ["SLOT"]
+		for link, p in vardb._owners.iter_owners(paths):
+			cat, pn = catpkgsplit(link.mycpv)[:2]
+			slot, = aux_get(link.mycpv, aux_keys)
+			rValue.add("%s/%s:%s" % (cat, pn, slot))
+		return rValue
+
+	def load(self):
+		self._setAtoms(self.mapPathsToAtoms(self._files))
+
+	def singleBuilder(cls, options, settings, trees):
+		if not "files" in options:
+			raise SetConfigError("no files given")
+
+		import shlex
+		return cls(vardb=trees["vartree"].dbapi,
+			files=frozenset(shlex.split(options["files"])))
+
+	singleBuilder = classmethod(singleBuilder)
+
 class InheritSet(PackageSet):
 
 	_operations = ["merge", "unmerge"]