From patchwork Wed Jul 6 18:41:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Larson X-Patchwork-Id: 2509 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 5235F2413B for ; Wed, 6 Jul 2011 18:41:12 +0000 (UTC) Received: from mail-qy0-f173.google.com (mail-qy0-f173.google.com [209.85.216.173]) by fiordland.canonical.com (Postfix) with ESMTP id 0FD29A1804D for ; Wed, 6 Jul 2011 18:41:11 +0000 (UTC) Received: by qyk10 with SMTP id 10so2663596qyk.11 for ; Wed, 06 Jul 2011 11:41:11 -0700 (PDT) Received: by 10.229.1.140 with SMTP id 12mr6781149qcf.118.1309977670932; Wed, 06 Jul 2011 11:41:10 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.229.48.135 with SMTP id r7cs87190qcf; Wed, 6 Jul 2011 11:41:10 -0700 (PDT) Received: by 10.213.17.19 with SMTP id q19mr1348482eba.101.1309977669551; Wed, 06 Jul 2011 11:41:09 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id y5si11197787eef.101.2011.07.06.11.41.09; Wed, 06 Jul 2011 11:41:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QeX24-0001h3-Fs for ; Wed, 06 Jul 2011 18:41:08 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id 772A82E890E for ; Wed, 6 Jul 2011 18:41:08 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dispatcher X-Launchpad-Branch: ~linaro-validation/lava-dispatcher/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 74 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 74: Clean up tmpdirs on successful deployment Message-Id: <20110706184108.10490.70553.launchpad@loganberry.canonical.com> Date: Wed, 06 Jul 2011 18:41:08 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13376"; Instance="initZopeless config overlay" X-Launchpad-Hash: 767bbc098910fd195cc2b2fc939e98733ddeab3d ------------------------------------------------------------ revno: 74 fixes bug(s): https://launchpad.net/bugs/806571 committer: Paul Larson branch nick: dispatcher-testing-branch timestamp: Wed 2011-07-06 12:16:22 -0500 message: Clean up tmpdirs on successful deployment modified: lava_dispatcher/actions/android_deploy.py lava_dispatcher/actions/deploy.py --- lp:lava-dispatcher https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk You are subscribed to branch lp:lava-dispatcher. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription === modified file 'lava_dispatcher/actions/android_deploy.py' --- lava_dispatcher/actions/android_deploy.py 2011-06-29 10:22:40 +0000 +++ lava_dispatcher/actions/android_deploy.py 2011-07-06 17:16:22 +0000 @@ -58,8 +58,9 @@ self.deploy_linaro_android_testrootfs(system_url) self.purge_linaro_android_sdcard() except: + raise + finally: shutil.rmtree(self.tarball_dir) - raise def download_tarballs(self, boot_url, system_url, data_url, use_cache=True): """Download tarballs from a boot, system and data tarball url === modified file 'lava_dispatcher/actions/deploy.py' --- lava_dispatcher/actions/deploy.py 2011-06-27 04:55:08 +0000 +++ lava_dispatcher/actions/deploy.py 2011-07-06 17:16:22 +0000 @@ -51,8 +51,9 @@ self.deploy_linaro_rootfs(root_url) self.deploy_linaro_bootfs(boot_url) except: + raise + finally: shutil.rmtree(self.tarball_dir) - raise def _get_partition_offset(self, image, partno): cmd = 'parted %s -m -s unit b print' % image