[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4473/8267] wic: get rid of image_output_dir variable
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 4473/8267] wic: get rid of image_output_dir variable
- Date: Sun, 17 Dec 2017 02:05:10 +0000 (UTC)
commit 3571e3e77f12f01683ff613cf8bc4af1180b075e
Author: Ed Bartosh <ed bartosh linux intel com>
Date: Thu Feb 2 15:32:59 2017 +0200
wic: get rid of image_output_dir variable
Used options.outdir instead of image_output_dir.
There is no sense to use extra variable for this.
(From OE-Core rev: c6013dcb158a84d48cc2677f1509681cf9e0a3cb)
Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
Signed-off-by: Ross Burton <ross burton intel com>
Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
scripts/wic | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/scripts/wic b/scripts/wic
index 33355ee..17e8231 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -203,10 +203,6 @@ def wic_create_subcommand(args, usage_str):
"kickstart (.wks) filename)\n" % args[0])
sys.exit(1)
- image_output_dir = ""
- if options.outdir:
- image_output_dir = options.outdir
-
if not options.image_name:
rootfs_dir = ''
if 'ROOTFS_DIR' in options.rootfs_dir:
@@ -254,7 +250,7 @@ def wic_create_subcommand(args, usage_str):
print("Creating image(s)...\n")
engine.wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir,
- native_sysroot, scripts_path, image_output_dir,
+ native_sysroot, scripts_path, options.outdir,
options.compressor, options.bmap, options.debug)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]