diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-06-29 18:01:42 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-02 23:08:38 +0100 |
| commit | 34172ef8056244a89cccbbc76de91eca7bc8b0c0 (patch) | |
| tree | 91e551985b03e728e4bd1df6acee44f7dc8c7d22 /scripts/lib/wic/kickstart/custom_commands | |
| parent | 335aa0fee865c23a067562323641bef1dcae687e (diff) | |
| download | poky-34172ef8056244a89cccbbc76de91eca7bc8b0c0.tar.gz | |
wic: Code cleanup: long lines, identation and whitespaces
Fixed pylint warnings bad-continuation, bad-continuation and
line-too-long.
(From OE-Core rev: db43e59f41b6bc19152cd4743585a3217015e272)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/kickstart/custom_commands')
| -rw-r--r-- | scripts/lib/wic/kickstart/custom_commands/micboot.py | 2 | ||||
| -rw-r--r-- | scripts/lib/wic/kickstart/custom_commands/partition.py | 20 |
2 files changed, 15 insertions, 7 deletions
diff --git a/scripts/lib/wic/kickstart/custom_commands/micboot.py b/scripts/lib/wic/kickstart/custom_commands/micboot.py index 358b0ea9cd..1fa282b2f6 100644 --- a/scripts/lib/wic/kickstart/custom_commands/micboot.py +++ b/scripts/lib/wic/kickstart/custom_commands/micboot.py | |||
| @@ -27,7 +27,7 @@ class Mic_Bootloader(F8_Bootloader): | |||
| 27 | forceLBA=False, location="", md5pass="", password="", | 27 | forceLBA=False, location="", md5pass="", password="", |
| 28 | upgrade=False, menus=""): | 28 | upgrade=False, menus=""): |
| 29 | F8_Bootloader.__init__(self, writePriority, appendLine, driveorder, | 29 | F8_Bootloader.__init__(self, writePriority, appendLine, driveorder, |
| 30 | forceLBA, location, md5pass, password, upgrade) | 30 | forceLBA, location, md5pass, password, upgrade) |
| 31 | 31 | ||
| 32 | self.menus = "" | 32 | self.menus = "" |
| 33 | self.ptable = "msdos" | 33 | self.ptable = "msdos" |
diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py b/scripts/lib/wic/kickstart/custom_commands/partition.py index fea4d6deb4..045b290ed3 100644 --- a/scripts/lib/wic/kickstart/custom_commands/partition.py +++ b/scripts/lib/wic/kickstart/custom_commands/partition.py | |||
| @@ -157,7 +157,9 @@ class Wic_PartData(Mic_PartData): | |||
| 157 | 157 | ||
| 158 | if not self.source: | 158 | if not self.source: |
| 159 | if not self.size: | 159 | if not self.size: |
| 160 | msger.error("The %s partition has a size of zero. Please specify a non-zero --size for that partition." % self.mountpoint) | 160 | msger.error("The %s partition has a size of zero. Please " |
| 161 | "specify a non-zero --size for that partition." % \ | ||
| 162 | self.mountpoint) | ||
| 161 | if self.fstype and self.fstype == "swap": | 163 | if self.fstype and self.fstype == "swap": |
| 162 | self.prepare_swap_partition(cr_workdir, oe_builddir, | 164 | self.prepare_swap_partition(cr_workdir, oe_builddir, |
| 163 | native_sysroot) | 165 | native_sysroot) |
| @@ -178,9 +180,14 @@ class Wic_PartData(Mic_PartData): | |||
| 178 | plugins = pluginmgr.get_source_plugins() | 180 | plugins = pluginmgr.get_source_plugins() |
| 179 | 181 | ||
| 180 | if self.source not in plugins: | 182 | if self.source not in plugins: |
| 181 | msger.error("The '%s' --source specified for %s doesn't exist.\n\tSee 'wic list source-plugins' for a list of available --sources.\n\tSee 'wic help source-plugins' for details on adding a new source plugin." % (self.source, self.mountpoint)) | 183 | msger.error("The '%s' --source specified for %s doesn't exist.\n\t" |
| 182 | 184 | "See 'wic list source-plugins' for a list of available" | |
| 183 | self._source_methods = pluginmgr.get_source_plugin_methods(self.source, partition_methods) | 185 | " --sources.\n\tSee 'wic help source-plugins' for " |
| 186 | "details on adding a new source plugin." % \ | ||
| 187 | (self.source, self.mountpoint)) | ||
| 188 | |||
| 189 | self._source_methods = pluginmgr.get_source_plugin_methods(\ | ||
| 190 | self.source, partition_methods) | ||
| 184 | self._source_methods["do_configure_partition"](self, self.sourceparams_dict, | 191 | self._source_methods["do_configure_partition"](self, self.sourceparams_dict, |
| 185 | cr, cr_workdir, | 192 | cr, cr_workdir, |
| 186 | oe_builddir, | 193 | oe_builddir, |
| @@ -466,9 +473,10 @@ class Wic_Partition(Mic_Partition): | |||
| 466 | removedAttrs = Mic_Partition.removedAttrs | 473 | removedAttrs = Mic_Partition.removedAttrs |
| 467 | 474 | ||
| 468 | def _getParser(self): | 475 | def _getParser(self): |
| 469 | def overhead_cb (option, opt_str, value, parser): | 476 | def overhead_cb(option, opt_str, value, parser): |
| 470 | if value < 1: | 477 | if value < 1: |
| 471 | raise OptionValueError("Option %s: invalid value: %r" % (option, value)) | 478 | raise OptionValueError("Option %s: invalid value: %r" % \ |
| 479 | (option, value)) | ||
| 472 | setattr(parser.values, option.dest, value) | 480 | setattr(parser.values, option.dest, value) |
| 473 | 481 | ||
| 474 | op = Mic_Partition._getParser(self) | 482 | op = Mic_Partition._getParser(self) |
