Revision 8e58e699 image_creator/dialog_util.py
| b/image_creator/dialog_util.py | ||
|---|---|---|
| 39 | 39 |
|
| 40 | 40 |
import os |
| 41 | 41 |
import re |
| 42 |
import json |
|
| 42 | 43 |
from image_creator.output.dialog import GaugeOutput |
| 43 | 44 |
from image_creator.util import MD5 |
| 44 | 45 |
from image_creator.kamaki_wrapper import Kamaki |
| ... | ... | |
| 84 | 85 |
|
| 85 | 86 |
def extract_metadata_string(session): |
| 86 | 87 |
"""Convert image metadata to text""" |
| 87 |
metadata = ['%s=%s' % (k, v) for (k, v) in session['metadata'].items()]
|
|
| 88 |
|
|
| 88 |
metadata = {}
|
|
| 89 |
metadata.update(session['metadata']) |
|
| 89 | 90 |
if 'task_metadata' in session: |
| 90 |
metadata.extend("%s=yes" % m for m in session['task_metadata'])
|
|
| 91 |
for key in session['task_metadata']: |
|
| 92 |
metadata[key] = 'yes' |
|
| 91 | 93 |
|
| 92 |
return '\n'.join(metadata) + '\n' |
|
| 94 |
return unicode(json.dumps({'properties': metadata,
|
|
| 95 |
'disk-format': 'diskdump'}, ensure_ascii=False)) |
|
| 93 | 96 |
|
| 94 | 97 |
|
| 95 | 98 |
def extract_image(session): |
Also available in: Unified diff