Correct release option show
authorGui Chen <gui.chen@intel.com>
Tue, 20 Sep 2011 07:24:33 +0000 (15:24 +0800)
committerGui Chen <gui.chen@intel.com>
Tue, 20 Sep 2011 07:24:33 +0000 (15:24 +0800)
Signed-off-by: Gui Chen <gui.chen@intel.com>
plugins/imager/fs_plugin.py
plugins/imager/livecd_plugin.py
plugins/imager/liveusb_plugin.py
plugins/imager/loop_plugin.py
plugins/imager/raw_plugin.py

index 2f56ac6..3d23172 100644 (file)
@@ -94,9 +94,8 @@ class FsPlugin(ImagerPlugin):
             creator.configure(createopts["repomd"])
             creator.unmount()
             creator.package(destdir)
-            outimage = creator.outimage
             if createopts['release'] is not None:
-                misc.create_release(ksconf, createopts['outdir'], createopts['name'], outimage, createopts['release'])
+                creator.release_output(ksconf, createopts['outdir'], createopts['name'], createopts['release'])
             creator.print_outimage_info()
         except errors.CreatorError:
             raise
index 67f595f..481e91a 100644 (file)
@@ -81,11 +81,9 @@ class LiveCDPlugin(ImagerPlugin):
             creator.configure(creatoropts["repomd"])
             creator.unmount()
             creator.package(creatoropts["outdir"])
-            outimage = creator.outimage
             if creatoropts['release'] is not None:
-                misc.create_release(ksconf, creatoropts['outdir'], creatoropts['name'], outimage, creatoropts['release'])
+                creator.release_output(ksconf, creatoropts['outdir'], creatoropts['name'], creatoropts['release'])
             creator.print_outimage_info()
-            outimage = creator.outimage
 
         except errors.CreatorError:
             raise
index 96e03e9..7f4e932 100644 (file)
@@ -83,11 +83,9 @@ class LiveUSBPlugin(ImagerPlugin):
             creator.configure(creatoropts["repomd"])
             creator.unmount()
             creator.package(creatoropts["outdir"])
-            outimage = creator.outimage
             if creatoropts['release'] is not None:
-                misc.create_release(ksconf, creatoropts['outdir'], creatoropts['name'], outimage, creatoropts['release'])
+                creator.release_output(ksconf, creatoropts['outdir'], creatoropts['name'], creatoropts['release'])
             creator.print_outimage_info()
-            outimage = creator.outimage
 
         except errors.CreatorError:
             raise
index 2690ce8..26d1a2b 100644 (file)
@@ -92,7 +92,7 @@ class LoopPlugin(ImagerPlugin):
             creator.package(creatoropts["outdir"])
             outimage = creator.outimage
             if creatoropts['release'] is not None:
-                misc.create_release(ksconf, creatoropts['outdir'], creatoropts['name'], outimage, creatoropts['release'])
+                creator.release_output(ksconf, creatoropts['outdir'], creatoropts['name'], creatoropts['release'])
             creator.print_outimage_info()
 
         except errors.CreatorError:
index b76b318..604049c 100644 (file)
@@ -80,9 +80,8 @@ class RawPlugin(ImagerPlugin):
             creator.configure(creatoropts["repomd"])
             creator.unmount()
             creator.package(creatoropts["outdir"])
-            outimage = creator.outimage
             if creatoropts['release'] is not None:
-                misc.create_release(ksconf, creatoropts['outdir'], creatoropts['name'], outimage, creatoropts['release'])
+                creator.release_output(ksconf, creatoropts['outdir'], creatoropts['name'], creatoropts['release'])
             creator.print_outimage_info()
 
         except errors.CreatorError: