From dbf466eb438759595eda22952a7409ec0ab398c8 Mon Sep 17 00:00:00 2001
From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Wed, 8 Aug 2012 15:11:24 +0300
Subject: [PATCH] Remove the image size from the image metadata

---
 image_creator/dialog_main.py   |    6 +++---
 image_creator/dialog_wizard.py |    1 +
 image_creator/disk.py          |   21 ++++++++++-----------
 image_creator/main.py          |    2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/image_creator/dialog_main.py b/image_creator/dialog_main.py
index 6af191e..3082a1c 100644
--- a/image_creator/dialog_main.py
+++ b/image_creator/dialog_main.py
@@ -146,7 +146,7 @@ def update_background_title(session):
 
     MB = 2 ** 20
 
-    size = (dev.meta['SIZE'] + MB - 1) // MB
+    size = (dev.size + MB - 1) // MB
     shrinked = 'shrinked' in session and session['shrinked']
     postfix = " (shrinked)" if shrinked else ''
 
@@ -205,7 +205,7 @@ def extract_image(session):
         try:
             dev = session['device']
             if "checksum" not in session:
-                size = dev.meta['SIZE']
+                size = dev.size
                 md5 = MD5(out)
                 session['checksum'] = md5.compute(session['snapshot'], size)
 
@@ -237,7 +237,7 @@ def extract_image(session):
 
 def upload_image(session):
     d = session["dialog"]
-    size = session['device'].meta['SIZE']
+    size = session['device'].size
 
     if "account" not in session:
         d.msgbox("You need to provide your ~okeanos login username before you "
diff --git a/image_creator/dialog_wizard.py b/image_creator/dialog_wizard.py
index 967a79f..8e122a8 100644
--- a/image_creator/dialog_wizard.py
+++ b/image_creator/dialog_wizard.py
@@ -187,6 +187,7 @@ def extract_image(session):
 
     #Shrink
     size = device.shrink()
+    metadata.update(device.meta)
 
     #MD5
     md5 = MD5(out)
diff --git a/image_creator/disk.py b/image_creator/disk.py
index a283d7a..7e3b166 100644
--- a/image_creator/disk.py
+++ b/image_creator/disk.py
@@ -168,6 +168,7 @@ class DiskDevice(object):
         self.bootable = bootable
         self.progress_bar = None
         self.guestfs_device = None
+        self.size = 0
         self.meta = {}
 
         self.g = guestfs.GuestFS()
@@ -213,7 +214,7 @@ class DiskDevice(object):
                              "We only support images with one OS.")
         self.root = roots[0]
         self.guestfs_device = self.g.part_to_dev(self.root)
-        self.meta['SIZE'] = self.g.blockdev_getsize64(self.guestfs_device)
+        self.size = self.g.blockdev_getsize64(self.guestfs_device)
         self.meta['PARTITION_TABLE'] = \
             self.g.part_get_parttype(self.guestfs_device)
 
@@ -343,12 +344,12 @@ class DiskDevice(object):
             # Most disk manipulation programs leave 2048 sectors after the last
             # partition
             new_size = last_part['part_end'] + 1 + 2048 * sector_size
-            self.meta['SIZE'] = min(self.meta['SIZE'], new_size)
+            self.size = min(self.size, new_size)
             break
 
         if not re.match("ext[234]", fstype):
             self.out.warn("Don't know how to resize %s partitions." % fstype)
-            return self.meta['SIZE']
+            return self.size
 
         part_dev = "%s%d" % (self.guestfs_device, last_part['part_num'])
         self.g.e2fsck_f(part_dev)
@@ -405,19 +406,17 @@ class DiskDevice(object):
 
         new_size = (end + 1) * sector_size
 
-        assert (new_size <= self.meta['SIZE'])
+        assert (new_size <= self.size)
 
         if self.meta['PARTITION_TABLE'] == 'gpt':
             ptable = GPTPartitionTable(self.real_device)
-            self.meta['SIZE'] = ptable.shrink(new_size, self.meta['SIZE'])
+            self.size = ptable.shrink(new_size, self.size)
         else:
-            self.meta['SIZE'] = min(new_size + 2048 * sector_size,
-                                    self.meta['SIZE'])
+            self.size = min(new_size + 2048 * sector_size, self.size)
 
-        self.out.success("new size is %dMB" %
-                         ((self.meta['SIZE'] + MB - 1) // MB))
+        self.out.success("new size is %dMB" % ((self.size + MB - 1) // MB))
 
-        return self.meta['SIZE']
+        return self.size
 
     def dump(self, outfile):
         """Dumps the content of device into a file.
@@ -427,7 +426,7 @@ class DiskDevice(object):
         """
         MB = 2 ** 20
         blocksize = 4 * MB  # 4MB
-        size = self.meta['SIZE']
+        size = self.size
         progr_size = (size + MB - 1) // MB  # in MB
         progressbar = self.out.Progress(progr_size, "Dumping image file", 'mb')
 
diff --git a/image_creator/main.py b/image_creator/main.py
index 2c6ff5b..85c9272 100644
--- a/image_creator/main.py
+++ b/image_creator/main.py
@@ -219,7 +219,7 @@ def image_creator():
         metadata = image_os.meta
         dev.umount()
 
-        size = options.shrink and dev.shrink() or dev.meta['SIZE']
+        size = options.shrink and dev.shrink() or dev.size
         metadata.update(dev.meta)
 
         # Add command line metadata to the collected ones...
-- 
1.7.10.4