From 39cfd61abeed84a0eb8b9a61373bb67d5c767886 Mon Sep 17 00:00:00 2001 From: Nikos Skalkotos Date: Sat, 24 Mar 2012 10:40:21 +0200 Subject: [PATCH] Capitalize all image metadata keys --- image_creator/main.py | 2 +- image_creator/os_type/__init__.py | 2 +- image_creator/os_type/ubuntu.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/image_creator/main.py b/image_creator/main.py index 97b558c..bc4a47d 100755 --- a/image_creator/main.py +++ b/image_creator/main.py @@ -142,7 +142,7 @@ def image_creator(): dev.umount() size = options.shrink and dev.shrink() or dev.size() - metadata['size'] = str(size // 2 ** 20) + metadata['SIZE'] = str(size // 2 ** 20) if options.outfile is not None: f = open('%s.%s' % (options.outfile, 'meta'), 'w') diff --git a/image_creator/os_type/__init__.py b/image_creator/os_type/__init__.py index 4f0ec36..b9fd4e0 100644 --- a/image_creator/os_type/__init__.py +++ b/image_creator/os_type/__init__.py @@ -106,7 +106,7 @@ class OSBase(object): meta['ROOT_PARTITION'] = "%d" % self.g.part_to_partnum(self.root) meta['OSFAMILY'] = self.g.inspect_get_type(self.root) meta['OS'] = self.g.inspect_get_distro(self.root) - meta['description'] = self.g.inspect_get_product_name(self.root) + meta['DESCRIPTION'] = self.g.inspect_get_product_name(self.root) return meta diff --git a/image_creator/os_type/ubuntu.py b/image_creator/os_type/ubuntu.py index 7f3c046..77d80ff 100644 --- a/image_creator/os_type/ubuntu.py +++ b/image_creator/os_type/ubuntu.py @@ -41,8 +41,8 @@ class Ubuntu(Linux): for app in apps: if app['app_name'] == 'kubuntu-desktop': meta['OS'] = 'kubuntu' - meta['description'] = \ - meta['description'].replace('Ubuntu', 'Kubuntu') + meta['DESCRIPTION'] = \ + meta['DESCRIPTION'].replace('Ubuntu', 'Kubuntu') break return meta -- 1.7.10.4