From 19687e3e1589b1c644ae4ba4b82cba3646fafd88 Mon Sep 17 00:00:00 2001 From: Quentin Smith Date: Tue, 18 Oct 2011 10:10:44 -0400 Subject: [PATCH] Put the build number in the temporary directory builds happen in --- debian/changelog | 6 ++++++ invirtibuilder | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index b5a355d..5b9aba4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +invirt-dev (0.1.15) unstable; urgency=low + + * Put the build number in the temporary directory builds happen in + + -- Quentin Smith Tue, 18 Oct 2011 10:10:24 -0400 + invirt-dev (0.1.14) unstable; urgency=low * More bug fixes for multi-distro support diff --git a/invirtibuilder b/invirtibuilder index 2882272..9260b1e 100755 --- a/invirtibuilder +++ b/invirtibuilder @@ -267,7 +267,7 @@ def makeReadable(workdir): os.chmod(workdir, 0755) @contextlib.contextmanager -def packageWorkdir(package, commit): +def packageWorkdir(package, commit, build_id): """Checkout the package in a temporary working directory. This context manager returns that working directory. The requested @@ -277,7 +277,7 @@ def packageWorkdir(package, commit): When the context wrapped with this context manager is exited, the working directory is automatically deleted. """ - workdir = tempfile.mkdtemp() + workdir = tempfile.mkdtemp(prefix=("b%d-" % build_id)) try: p_archive = subprocess.Popen( ['git', 'archive', @@ -371,7 +371,7 @@ def build(): # do the build ourselves else: db.failed_stage = 'checking out package source' - with packageWorkdir(package, commit) as workdir: + with packageWorkdir(package, commit, db.build_id) as workdir: db.failed_stage = 'preparing source package' packagedir = os.path.join(workdir, package) -- 1.7.9.5