summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-09-02 13:58:08 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-03 12:43:27 +0100
commitc9876833a473817599656f5ec4cfd48b65e73394 (patch)
tree8a0730e72a71b384c47b6ed8a9d4f0d6bdbd8ecd
parent90486ff047336764f1ea4cabcf88d1d38cfb065b (diff)
downloadpoky-c9876833a473817599656f5ec4cfd48b65e73394.tar.gz
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) (From OE-Core rev: 83b1aa4b6480b625d1accee4c594162df2e84b96) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/wic/kickstart/custom_commands/partition.py6
1 files 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 dd6edd2f10..6defc9903f 100644
--- a/scripts/lib/wic/kickstart/custom_commands/partition.py
+++ b/scripts/lib/wic/kickstart/custom_commands/partition.py
@@ -27,10 +27,10 @@
27import os 27import os
28import tempfile 28import tempfile
29import uuid 29import uuid
30from optparse import OptionValueError
30 31
31from pykickstart.commands.partition import FC4_PartData, FC4_Partition 32from pykickstart.commands.partition import FC4_PartData, FC4_Partition
32from wic.utils.oe.misc import * 33from wic.utils.oe.misc import *
33from wic.kickstart.custom_commands import *
34from wic.plugin import pluginmgr 34from wic.plugin import pluginmgr
35 35
36partition_methods = { 36partition_methods = {
@@ -426,10 +426,10 @@ class Wic_PartData(FC4_PartData):
426 if self.label: 426 if self.label:
427 label_str = "-n %s" % self.label 427 label_str = "-n %s" % self.label
428 428
429 dosfs_cmd = "mkdosfs %s -S 512 -C %s %d" % (label_str, fs, blocks) 429 dosfs_cmd = "mkdosfs %s -S 512 -C %s %d" % (label_str, rootfs, blocks)
430 exec_native_cmd(dosfs_cmd, native_sysroot) 430 exec_native_cmd(dosfs_cmd, native_sysroot)
431 431
432 chmod_cmd = "chmod 644 %s" % fs 432 chmod_cmd = "chmod 644 %s" % rootfs
433 exec_cmd(chmod_cmd) 433 exec_cmd(chmod_cmd)
434 434
435 def prepare_empty_partition_squashfs(self, cr_workdir, oe_builddir, 435 def prepare_empty_partition_squashfs(self, cr_workdir, oe_builddir,