aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Damien Martin-Guillerez <dmarting@google.com>2015-09-19 09:51:02 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2015-09-21 08:59:49 +0000
commit90c585b620b7c9969118b8ff2acb56a2ab723856 (patch)
tree3eef89bfb98d969f51b2ca4bf812d2ea026c8a08
parent21da72604c4729dead9d31dd80c923aa1962f3c9 (diff)
[Docker] Strip the identifier in top file
-- MOS_MIGRATED_REVID=103451349
-rw-r--r--tools/build_defs/docker/rewrite_json.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/build_defs/docker/rewrite_json.py b/tools/build_defs/docker/rewrite_json.py
index 850e321f1f..a6248909ac 100644
--- a/tools/build_defs/docker/rewrite_json.py
+++ b/tools/build_defs/docker/rewrite_json.py
@@ -230,14 +230,14 @@ def GetParentIdentifier(f):
# TODO(dmarting): Maybe we could drop the 'top' file all together?
top = GetTarFile(f, 'top')
if top:
- return top
+ return top.strip()
repositories = GetTarFile(f, 'repositories')
if repositories:
data = json.loads(repositories)
for k1 in data:
for k2 in data[k1]:
# Returns the first found key
- return data[k1][k2]
+ return data[k1][k2].strip()
return None