Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Unified Diff: bin/cros_au_test_harness.py

Issue 6480085: Fix tree closer. Deal with none case for PFQ. (Closed) Base URL: http://git.chromium.org/git/crosutils.git@master
Patch Set: Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bin/cros_au_test_harness.py
diff --git a/bin/cros_au_test_harness.py b/bin/cros_au_test_harness.py
index 2c2f8f8218f28b129d0d02db5e82f22ad1468a19..0af3b722a816bd401b61476d7e764a998691e9c2 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)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698