From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 23 Oct 2010 11:26:45 +0000 (+0200)
Subject: Merge remote branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9299d5094fbc580ac771a0b16187e1fccac7299a;p=portage.git

Merge remote branch 'overlays-gentoo-org/master' into prefix

Conflicts:
	pym/_emerge/EbuildBuildDir.py
---

9299d5094fbc580ac771a0b16187e1fccac7299a
diff --cc pym/_emerge/EbuildBuildDir.py
index 1ab157e55,1da3c93ae..0451aec6f
--- a/pym/_emerge/EbuildBuildDir.py
+++ b/pym/_emerge/EbuildBuildDir.py
@@@ -5,7 -5,7 +5,8 @@@ from _emerge.AsynchronousLock import As
  from _emerge.SlotObject import SlotObject
  import portage
  from portage import os
 +import sys
+ from portage.exception import PortageException
  import errno
  
  class EbuildBuildDir(SlotObject):