From ebb19aa01a53e07594fed9104d5d6a3040b5a60a Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Fri, 27 Mar 2015 19:11:53 -0700 Subject: [PATCH] Fix up a few callers of GetTypeAndDevice. Change-Id: I8f2d8d28b60715f917e9aceb8f851ad652034aa7 --- tools/releasetools/common.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 63e438af81..f76f812a5b 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -1252,14 +1252,11 @@ def MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img, _, _, patch = d.ComputePatch() output_sink("recovery-from-boot.p", patch) - td_pair = GetTypeAndDevice("/boot", info_dict) - if not td_pair: + try: + boot_type, boot_device = GetTypeAndDevice("/boot", info_dict) + recovery_type, recovery_device = GetTypeAndDevice("/recovery", info_dict) + except KeyError: return - boot_type, boot_device = td_pair - td_pair = GetTypeAndDevice("/recovery", info_dict) - if not td_pair: - return - recovery_type, recovery_device = td_pair sh = """#!/system/bin/sh if ! applypatch -c %(recovery_type)s:%(recovery_device)s:%(recovery_size)d:%(recovery_sha1)s; then