FAFT: Remove the backwards-compatible way to handle dev_key_path
The FAFT utils library is now deployable like others FAFT code.
Don't need to maintain the backwards compatibility.
BUG=None
TEST=Executed the RPC server.
Change-Id: I67aa3add5f8ad6473679eff20fdce8c550ee8ff5
Reviewed-on: https://chromium-review.googlesource.com/290582
Commit-Ready: Wai-Hong Tam <waihong@chromium.org>
Tested-by: Wai-Hong Tam <waihong@chromium.org>
Reviewed-by: Wai-Hong Tam <waihong@chromium.org>
diff --git a/client/cros/faft/rpc_functions.py b/client/cros/faft/rpc_functions.py
index 71cef1f..8f1eae3 100755
--- a/client/cros/faft/rpc_functions.py
+++ b/client/cros/faft/rpc_functions.py
@@ -7,7 +7,7 @@
These can be exposed via a xmlrpci server running on the DUT.
"""
-import functools, os, shutil, tempfile
+import functools, os, tempfile
import common
from autotest_lib.client.cros.faft.utils import (cgpt_handler,
@@ -117,17 +117,9 @@
'ec')
self._kernel_handler = kernel_handler.KernelHandler()
- # TODO(waihong): The dev_key_path is a new argument. We do that in
- # order not to break the old image and still be able to run.
- try:
- self._kernel_handler.init(self._os_if,
- dev_key_path='/usr/share/vboot/devkeys',
- internal_disk=True)
- except TypeError:
- # Copy the key to the current working directory.
- shutil.copy('/usr/share/vboot/devkeys/kernel_data_key.vbprivk', '.')
- self._kernel_handler.init(self._os_if,
- internal_disk=True)
+ self._kernel_handler.init(self._os_if,
+ dev_key_path='/usr/share/vboot/devkeys',
+ internal_disk=True)
self._tpm_handler = tpm_handler.TpmHandler()
self._tpm_handler.init(self._os_if)