fix incorrect location outdir to destdir

Change-Id: Ic0ec2d5ed9cefbc90d8a4b1149ecb7d984ad1e9f
Signed-off-by: Gui Chen <gui.chen@intel.com>
Conflicts:
	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

diff --git a/plugins/imager/fs_plugin.py b/plugins/imager/fs_plugin.py
index 28ec970..282097a 100644 (file)
--- a/plugins/imager/fs_plugin.py
+++ b/plugins/imager/fs_plugin.py
@@ -121,9 +121,10 @@ class FsPlugin(ImagerPlugin):
             creator.configure(creatoropts["repomd"])
             creator.copy_kernel()
             creator.unmount()
-            creator.package(creatoropts["outdir"])
+            creator.package(creatoropts["destdir"])
             if creatoropts['release'] is not None:
-                creator.release_output(ksconf, creatoropts['outdir'], creatoropts['release'])
+                creator.release_output(ksconf, creatoropts['destdir'],
+                        creatoropts['release'])
             creator.print_outimage_info()
         except errors.CreatorError:
             raise

diff --git a/plugins/imager/livecd_plugin.py b/plugins/imager/livecd_plugin.py
index 7d17d85..44b57ef 100644 (file)
--- a/plugins/imager/livecd_plugin.py
+++ b/plugins/imager/livecd_plugin.py
@@ -112,9 +112,9 @@ class LiveCDPlugin(ImagerPlugin):
             creator.configure(creatoropts["repomd"])
             creator.copy_kernel()
             creator.unmount()
-            creator.package(creatoropts["outdir"])
+            creator.package(creatoropts["destdir"])
             if creatoropts['release'] is not None:
-                creator.release_output(ksconf, creatoropts['outdir'], creatoropts['release'])
+                creator.release_output(ksconf, creatoropts['destdir'], creatoropts['release'])
             creator.print_outimage_info()
 
         except errors.CreatorError:

diff --git a/plugins/imager/liveusb_plugin.py b/plugins/imager/liveusb_plugin.py
index 0c80acc..b00b2eb 100644 (file)
--- a/plugins/imager/liveusb_plugin.py
+++ b/plugins/imager/liveusb_plugin.py
@@ -113,9 +113,9 @@ class LiveUSBPlugin(ImagerPlugin):
             creator.configure(creatoropts["repomd"])
             creator.copy_kernel()
             creator.unmount()
-            creator.package(creatoropts["outdir"])
+            creator.package(creatoropts["destdir"])
             if creatoropts['release'] is not None:
-                creator.release_output(ksconf, creatoropts['outdir'], creatoropts['release'])
+                creator.release_output(ksconf, creatoropts['destdir'], creatoropts['release'])
             creator.print_outimage_info()
 
         except errors.CreatorError:

diff --git a/plugins/imager/loop_plugin.py b/plugins/imager/loop_plugin.py
index 8b4dcaf..50e1c01 100644 (file)
--- a/plugins/imager/loop_plugin.py
+++ b/plugins/imager/loop_plugin.py
@@ -122,11 +122,11 @@ class LoopPlugin(ImagerPlugin):
             creator.configure(creatoropts["repomd"])
             creator.copy_kernel()
             creator.unmount()
-            creator.package(creatoropts["outdir"])
+            creator.package(creatoropts["destdir"])
 
             if creatoropts['release'] is not None:
                 creator.release_output(ksconf,
-                                       creatoropts['outdir'],
+                                       creatoropts['destdir'],
                                        creatoropts['release'])
             creator.print_outimage_info()
 

diff --git a/plugins/imager/raw_plugin.py b/plugins/imager/raw_plugin.py
index 2dfa8e7..a24b549 100644 (file)
--- a/plugins/imager/raw_plugin.py
+++ b/plugins/imager/raw_plugin.py
@@ -127,9 +127,9 @@ class RawPlugin(ImagerPlugin):
             creator.copy_kernel()
             creator.unmount()
             creator.generate_bmap()
-            creator.package(creatoropts["outdir"])
+            creator.package(creatoropts["destdir"])
             if creatoropts['release'] is not None:
-                creator.release_output(ksconf, creatoropts['outdir'], creatoropts['release'])
+                creator.release_output(ksconf, creatoropts['destdir'], creatoropts['release'])
             creator.print_outimage_info()
 
         except errors.CreatorError: