[oe-commits] Ed Bartosh : wic: fix errors in partition.py module

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 83b1aa4b6480b625d1accee4c594162df2e84b96
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=83b1aa4b6480b625d1accee4c594162df2e84b96

Author: Ed Bartosh <ed.bartosh at linux.intel.com>
Date:   Wed Sep  2 13:58:08 2015 +0300

wic: fix errors in partition.py module

Fixed the followring errors found by pylint in partition.py:

E: 42, 0: class already defined line 33 (function-redefined)
E:429,63: Undefined variable 'fs' (undefined-variable)
E:432,37: Undefined variable 'fs' (undefined-variable)
E:481, 0: class already defined line 33 (function-redefined)
E:488,22: Undefined variable 'OptionValueError' (undefined-variable)

Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/lib/wic/kickstart/custom_commands/partition.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py b/scripts/lib/wic/kickstart/custom_commands/partition.py
index dd6edd2..6defc99 100644
--- a/scripts/lib/wic/kickstart/custom_commands/partition.py
+++ b/scripts/lib/wic/kickstart/custom_commands/partition.py
@@ -27,10 +27,10 @@
 import os
 import tempfile
 import uuid
+from optparse import OptionValueError
 
 from pykickstart.commands.partition import FC4_PartData, FC4_Partition
 from wic.utils.oe.misc import *
-from wic.kickstart.custom_commands import *
 from wic.plugin import pluginmgr
 
 partition_methods = {
@@ -426,10 +426,10 @@ class Wic_PartData(FC4_PartData):
         if self.label:
             label_str = "-n %s" % self.label
 
-        dosfs_cmd = "mkdosfs %s -S 512 -C %s %d" % (label_str, fs, blocks)
+        dosfs_cmd = "mkdosfs %s -S 512 -C %s %d" % (label_str, rootfs, blocks)
         exec_native_cmd(dosfs_cmd, native_sysroot)
 
-        chmod_cmd = "chmod 644 %s" % fs
+        chmod_cmd = "chmod 644 %s" % rootfs
         exec_cmd(chmod_cmd)
 
     def prepare_empty_partition_squashfs(self, cr_workdir, oe_builddir,