[Branch,~linaro-validation/lava-dispatcher/trunk] Rev 111: add missing parameter introduced by config branch

Message ID 20110915084414.13279.30706.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Spring Zhang Sept. 15, 2011, 8:44 a.m.
------------------------------------------------------------
revno: 111
committer: Spring Zhang <spring.zhang@linaro.org>
branch nick: another-inject-kernel
timestamp: Thu 2011-09-15 16:39:32 +0800
message:
  add missing parameter introduced by config branch
modified:
  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

Patch

=== modified file 'lava_dispatcher/actions/deploy.py'
--- lava_dispatcher/actions/deploy.py	2011-09-15 07:46:03 +0000
+++ lava_dispatcher/actions/deploy.py	2011-09-15 08:39:32 +0000
@@ -197,6 +197,7 @@ 
 
     def refresh_hwpack(self, kernel_matrix, hwpack, use_cache=True):
         client = self.client
+        lava_cachedir = self.context.lava_cachedir
         LAVA_IMAGE_TMPDIR = self.context.lava_image_tmpdir
         print "Deploying new kernel"
         new_kernel = kernel_matrix[0]
@@ -210,8 +211,8 @@ 
         tarball_dir = mkdtemp(dir=LAVA_IMAGE_TMPDIR)
         os.chmod(tarball_dir, 0755)
         if use_cache:
-            kernel_path = download_with_cache(new_kernel, tarball_dir)
-            hwpack_path = download_with_cache(hwpack, tarball_dir)
+            kernel_path = download_with_cache(new_kernel, tarball_dir, lava_cachedir)
+            hwpack_path = download_with_cache(hwpack, tarball_dir, lava_cachedir)
         else:
             kernel_path = download(new_kernel, tarball_dir)
             hwpack_path = download(hwpack, tarball_dir)