public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] portage r13074 - main/branches/2.1.6/pym/portage/dbapi
@ 2009-03-12  5:54 Zac Medico (zmedico)
  0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2009-03-12  5:54 UTC (permalink / raw
  To: gentoo-commits

Author: zmedico
Date: 2009-03-12 05:54:45 +0000 (Thu, 12 Mar 2009)
New Revision: 13074

Modified:
   main/branches/2.1.6/pym/portage/dbapi/vartree.py
Log:
Bug #262211 - Make vardbapi.aux_get() translate empty SLOT to 0 since other
code expects non-empty SLOT (for generation package slot atoms). (trunk r13060)

Modified: main/branches/2.1.6/pym/portage/dbapi/vartree.py
===================================================================
--- main/branches/2.1.6/pym/portage/dbapi/vartree.py	2009-03-12 05:54:20 UTC (rev 13073)
+++ main/branches/2.1.6/pym/portage/dbapi/vartree.py	2009-03-12 05:54:45 UTC (rev 13074)
@@ -518,6 +518,10 @@
 					cache_data[aux_key] = mydata[aux_key]
 				self._aux_cache["packages"][mycpv] = (mydir_mtime, cache_data)
 				self._aux_cache["modified"].add(mycpv)
+		if not mydata['SLOT']:
+			# Empty slot triggers InvalidAtom exceptions when generating slot
+			# atoms for packages, so translate it to '0' here.
+			mydata['SLOT'] = '0'
 		return [mydata[x] for x in wants]
 
 	def _aux_get(self, mycpv, wants, st=None):




^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2009-03-12  5:54 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-12  5:54 [gentoo-commits] portage r13074 - main/branches/2.1.6/pym/portage/dbapi Zac Medico (zmedico)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox