summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-04-22 15:11:16 -0700
committerZac Medico <zmedico@gentoo.org>2012-04-22 15:11:16 -0700
commit9ccefaf0cd5987eadebac66e4c15464b65795cda (patch)
treec35b18429e667f623a348f74f4de4bfe95f56a0a
parentbb4113adef8e412c7dfa934cbaf0123f08a071e1 (diff)
downloadportage-9ccefaf0cd5987eadebac66e4c15464b65795cda.tar.gz
portage-9ccefaf0cd5987eadebac66e4c15464b65795cda.tar.bz2
portage-9ccefaf0cd5987eadebac66e4c15464b65795cda.zip
doebuild: cleanup tempfile if package phase fails
-rw-r--r--pym/portage/package/ebuild/doebuild.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 29bef0917..da30bda38 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -1040,6 +1040,13 @@ def doebuild(myebuild, mydo, _unused=None, settings=None, debug=0, listonly=0,
if mydo == "package" and bintree is not None:
bintree.inject(mysettings.mycpv,
filename=mysettings["PORTAGE_BINPKG_TMPFILE"])
+ else:
+ if "PORTAGE_BINPKG_TMPFILE" in mysettings:
+ try:
+ os.unlink(mysettings["PORTAGE_BINPKG_TMPFILE"])
+ except OSError:
+ pass
+
elif mydo=="qmerge":
# check to ensure install was run. this *only* pops up when users
# forget it and are using ebuild