From e902cd62fdbde268f87690f5ca7fa9f816d7dac2 Mon Sep 17 00:00:00 2001
From: Joseph Schorr <joseph.schorr@coreos.com>
Date: Fri, 16 Jan 2015 17:29:59 -0500
Subject: [PATCH] Handle capabilities strings with both spaces and commas
 (since Docker doesn't have this documented yet)

---
 formats/aci.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/formats/aci.py b/formats/aci.py
index 05f1dce3e..ea108830f 100644
--- a/formats/aci.py
+++ b/formats/aci.py
@@ -3,6 +3,7 @@ from util.streamlayerformat import StreamLayerMerger
 from formats.tarimageformatter import TarImageFormatter
 
 import json
+import re
 
 class ACIImage(TarImageFormatter):
   """ Image formatter which produces an ACI-compatible TAR.
@@ -46,10 +47,11 @@ class ACIImage(TarImageFormatter):
         "value": str(cpu)
       }
 
-    def _isolate_capabilities(capabilities_set):
+    def _isolate_capabilities(capabilities_set_value):
+      capabilities_set = re.split(r'[\s,]', capabilities_set_value)
       return {
         "name": "capabilities/bounding-set",
-        "value": str(capabilities_set)
+        "value": ' '.join(capabilities_set)
       }
 
     mappers = {