From 69cdce233ebc90279ed0dbe924a7fff3c78b623c Mon Sep 17 00:00:00 2001 From: Chris Sosa Date: Tue, 15 Feb 2011 12:51:06 -0800 Subject: [PATCH] Fix tree closer. Deal with none case for PFQ. Change-Id: Ia7883c196c688236051a4637561c9a01be5358cb BUG=TreeCloser TEST=Ran with simple prefix for x86-generic and no keys Review URL: http://codereview.chromium.org/6480085 --- bin/cros_au_test_harness.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/cros_au_test_harness.py b/bin/cros_au_test_harness.py index 2c2f8f8218..0af3b722a8 100755 --- a/bin/cros_au_test_harness.py +++ b/bin/cros_au_test_harness.py @@ -659,7 +659,8 @@ class PregenerateAUDeltas(unittest.TestCase, AUTest): self._first_update = False # Generate a value that combines delta with private key path. - val = '%s+%s' % (src_image_path, private_key_path) + val = src_image_path + if private_key_path: val = '%s+%s' % (val, private_key_path) if not self.delta_list.has_key(image_path): self.delta_list[image_path] = set([val]) else: @@ -870,7 +871,7 @@ def _PregenerateUpdates(parser, options): args = [] for target, srcs in PregenerateAUDeltas.delta_list.items(): for src_key in srcs: - (src, key) = src_key.split('+') + (src, _ , key) = src_key.partition('+') # TODO(sosa): Add private key as part of caching name once devserver can # handle it its own cache. update_id = _GenerateUpdateId(target=target, src=src, key=key)