Revision f7a37648 kamaki/cli/commands/image.py
| b/kamaki/cli/commands/image.py | ||
|---|---|---|
| 306 | 306 |
container, sep, path = container_path.partition(':')
|
| 307 | 307 |
if not sep or not container or not path: |
| 308 | 308 |
raiseCLIError( |
| 309 |
'%s is not a valid pithos remote location' % container_path, |
|
| 309 |
'%s is not a valid pithos+ remote location' % container_path,
|
|
| 310 | 310 |
details=[ |
| 311 | 311 |
'To set "image" as container and "my_dir/img.diskdump" as', |
| 312 | 312 |
'the image path, try one of the following as ' |
| ... | ... | |
| 348 | 348 |
'is_public']).intersection(self.arguments): |
| 349 | 349 |
params[key] = self[key] |
| 350 | 350 |
|
| 351 |
#load properties |
|
| 352 |
properties = _load_image_props(self['property_file']) if ( |
|
| 353 |
self['property_file']) else dict() |
|
| 354 |
properties.update(self['properties']) |
|
| 351 |
#load properties |
|
| 352 |
properties = dict() |
|
| 353 |
if self['property_file']: |
|
| 354 |
for k, v in _load_image_props(self['property_file']).items(): |
|
| 355 |
properties[k.lower()] = v |
|
| 356 |
for k, v in self['properties'].items(): |
|
| 357 |
properties[k.lower()] = v |
|
| 355 | 358 |
|
| 356 | 359 |
printer = print_json if self['json_output'] else print_dict |
| 357 | 360 |
printer(self.client.register(name, location, params, properties)) |
Also available in: Unified diff