From: Ed Bartosh Date: Wed, 2 Sep 2015 10:58:08 +0000 (+0300) Subject: wic: fix errors in partition.py module X-Git-Tag: 2015-10~602 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=83b1aa4b6480b625d1accee4c594162df2e84b96;p=openembedded-core.git 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 Signed-off-by: Richard Purdie --- 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 @@ 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,