From: Gui Chen <gui.chen@intel.com>
Date: Mon, 19 Dec 2011 09:52:27 +0000 (+0800)
Subject: fix arm raw image dont' hint when existed
X-Git-Tag: 0.3~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=455384c51ad9d2cae1975a01b8bbb3f217514f4d;p=tools%2Fmic.git

fix arm raw image dont' hint when existed

Signed-off-by: Gui Chen <gui.chen@intel.com>
---

diff --git a/mic/imager/raw.py b/mic/imager/raw.py
index 22d7626..4fa74e3 100644
--- a/mic/imager/raw.py
+++ b/mic/imager/raw.py
@@ -47,6 +47,7 @@ class RawImageCreator(BaseImageCreator):
         self.__imgdir = None
         self.__disks = {}
         self.__disk_format = "raw"
+        self._diskinfo = []
         self.vmem = 512
         self.vcpu = 1
         self.checksum = False
@@ -116,12 +117,10 @@ class RawImageCreator(BaseImageCreator):
         cfg.write(mkinitrd)
         cfg.close()
 
-    #
-    # Actual implementation
-    #
-    def _mount_instroot(self, base_on = None):
-        self.__imgdir = self._mkdtemp()
-
+    def _get_parts(self):
+        if not self.ks:
+            raise CreatorError("Failed to get partition info," \
+                               "please check your kickstart setting")
         #Set a default partition if no partition is given out
         if not self.ks.handler.partition.partitions:
             partstr = "part / --size 1900 --ondisk sda --fstype=ext3"
@@ -133,8 +132,15 @@ class RawImageCreator(BaseImageCreator):
         #list of partitions from kickstart file
         parts = kickstart.get_partitions(self.ks)
 
-        #list of disks where a disk is an dict with name: and size
-        disks = []
+        return parts
+
+    def get_diskinfo(self):
+
+        if self._diskinfo:
+            return self._diskinfo
+
+        #get partition info from ks handler
+        parts = self._get_parts()
 
         for i in range(len(parts)):
             if parts[i].disk:
@@ -150,18 +156,27 @@ class RawImageCreator(BaseImageCreator):
             size =   parts[i].size * 1024L * 1024L
 
             found = False
-            for j in range(len(disks)):
-                if disks[j]['name'] == disk:
-                    disks[j]['size'] = disks[j]['size'] + size
+            for j in range(len(self._diskinfo)):
+                if self._diskinfo[j]['name'] == disk:
+                    self._diskinfo[j]['size'] = self._diskinfo[j]['size'] + size
                     found = True
                     break
                 else:
                     found = False
             if not found:
-                disks.append({ 'name': disk, 'size': size })
+                self._diskinfo.append({ 'name': disk, 'size': size })
+        return self._diskinfo
+
+    #
+    # Actual implemention
+    #
+    def _mount_instroot(self, base_on = None):
+        self.__imgdir = self._mkdtemp()
+
+        parts = self._get_parts()
 
         #create disk
-        for item in disks:
+        for item in self.get_diskinfo():
             msger.debug("Adding disk %s as %s/%s-%s.raw" % (item['name'],
                                                             self.__imgdir,
                                                             self.name,
diff --git a/plugins/imager/raw_plugin.py b/plugins/imager/raw_plugin.py
index 7146632..3bbda69 100644
--- a/plugins/imager/raw_plugin.py
+++ b/plugins/imager/raw_plugin.py
@@ -84,12 +84,13 @@ class RawPlugin(ImagerPlugin):
             creator._recording_pkgs = recording_pkgs
 
         if creatoropts['release'] is None:
-            imagefile = "%s-sda.raw" % os.path.join(creator.destdir, creator.name)
-            if os.path.exists(imagefile):
-                if msger.ask('The target image: %s already exists, cleanup and continue?' % imagefile):
-                    os.unlink(imagefile)
-                else:
-                    raise errors.Abort('Canceled')
+            for item in creator.get_diskinfo():
+                imagefile = "%s-%s.raw" % (os.path.join(creator.destdir, creator.name), item['name'])
+                if os.path.exists(imagefile):
+                    if msger.ask('The target image: %s already exists, cleanup and continue?' % imagefile):
+                       os.unlink(imagefile)
+                    else:
+                       raise errors.Abort('Canceled')
 
         try:
             creator.check_depend_tools()