aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/imager
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-09-02 13:58:14 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-02 23:46:51 +0100
commitbed98142e3e47ac2862ccf8fe3e4bdeabfc91172 (patch)
tree739f18228a3269cc80925e2aeabb21a5ef5b3542 /scripts/lib/wic/imager
parent3644b9f5ca25dfc61d4f5eda0f073c8a879b492b (diff)
downloadopenembedded-core-contrib-bed98142e3e47ac2862ccf8fe3e4bdeabfc91172.tar.gz
wic: fix pylint warning redefined-builtin
Renamed variables named as Python builtin functions. 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/imager')
-rw-r--r--scripts/lib/wic/imager/baseimager.py4
-rw-r--r--scripts/lib/wic/imager/direct.py6
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/lib/wic/imager/baseimager.py b/scripts/lib/wic/imager/baseimager.py
index 4abcabca4b..acbe948584 100644
--- a/scripts/lib/wic/imager/baseimager.py
+++ b/scripts/lib/wic/imager/baseimager.py
@@ -186,7 +186,7 @@ class BaseImageCreator(object):
def print_outimage_info(self):
msg = "The new image can be found here:\n"
self.outimage.sort()
- for file in self.outimage:
- msg += ' %s\n' % os.path.abspath(file)
+ for path in self.outimage:
+ msg += ' %s\n' % os.path.abspath(path)
msger.info(msg)
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index 74ebbe79b6..761e436db5 100644
--- a/scripts/lib/wic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -340,10 +340,10 @@ class DirectImageCreator(BaseImageCreator):
if p.get_rootfs() is None:
continue
if p.mountpoint == '/':
- str = ':'
+ suffix = ':'
else:
- str = '["%s"]:' % (p.mountpoint or p.label)
- msg += ' ROOTFS_DIR%s%s\n' % (str.ljust(20), p.get_rootfs())
+ suffix = '["%s"]:' % (p.mountpoint or p.label)
+ msg += ' ROOTFS_DIR%s%s\n' % (suffix.ljust(20), p.get_rootfs())
msg += ' BOOTIMG_DIR: %s\n' % self.bootimg_dir
msg += ' KERNEL_DIR: %s\n' % self.kernel_dir