diff options
| author | Radostin Stoyanov <rstoyanov1@gmail.com> | 2018-02-27 23:48:01 +0000 |
|---|---|---|
| committer | Radostin Stoyanov <rstoyanov1@gmail.com> | 2018-03-01 14:33:34 +0000 |
| commit | 1e98f1304b745eb6cde2be0ff862f2a48adc1233 (patch) | |
| tree | 14c6a75b10434d4dccbd6aa59e832d3c8d1e3769 /src/virtBootstrap | |
| parent | deb683b7812f212c6ffecc134155cbac3c6e9390 (diff) | |
| download | virt-bootstrap.git-1e98f1304b745eb6cde2be0ff862f2a48adc1233.tar.gz virt-bootstrap.git-1e98f1304b745eb6cde2be0ff862f2a48adc1233.tar.xz virt-bootstrap.git-1e98f1304b745eb6cde2be0ff862f2a48adc1233.zip | |
pylint: Resolve similar lines
This patch resolves the following pylint warning:
R: 1, 0: Similar lines in 2 files
==virtBootstrap.sources.docker_source:306
==virtBootstrap.sources.file_source:87
dest,
self.uid_map,
self.gid_map,
(self.root_password is None) # Create new disk?
)
else:
raise Exception("Unknown format:" + self.output_format)
(duplicate-code)
R: 1, 0: Similar lines in 2 files
==virtBootstrap.sources.file_source:50
==virtBootstrap.sources.virt_builder_source:58
self.output_format = kwargs.get('fmt', utils.DEFAULT_OUTPUT_FORMAT)
self.uid_map = kwargs.get('uid_map', [])
self.gid_map = kwargs.get('gid_map', [])
self.root_password = kwargs.get('root_password', None)
self.progress = kwargs['progress'].update_progress
(duplicate-code)
Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
Diffstat (limited to 'src/virtBootstrap')
| -rw-r--r-- | src/virtBootstrap/sources/docker_source.py | 3 | ||||
| -rw-r--r-- | src/virtBootstrap/sources/file_source.py | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/virtBootstrap/sources/docker_source.py b/src/virtBootstrap/sources/docker_source.py index ff96078..715e560 100644 --- a/src/virtBootstrap/sources/docker_source.py +++ b/src/virtBootstrap/sources/docker_source.py @@ -304,8 +304,7 @@ class DockerSource(object): logger.info("Mapping UID/GID") utils.map_id_in_image( len(self.layers), # Number of layers - dest, - self.uid_map, + dest, self.uid_map, self.gid_map, (self.root_password is None) # Create new disk? ) diff --git a/src/virtBootstrap/sources/file_source.py b/src/virtBootstrap/sources/file_source.py index be741ea..6b45bab 100644 --- a/src/virtBootstrap/sources/file_source.py +++ b/src/virtBootstrap/sources/file_source.py @@ -49,9 +49,9 @@ class FileSource(object): """ self.path = kwargs['uri'].path self.output_format = kwargs.get('fmt', utils.DEFAULT_OUTPUT_FORMAT) + self.root_password = kwargs.get('root_password', None) self.uid_map = kwargs.get('uid_map', []) self.gid_map = kwargs.get('gid_map', []) - self.root_password = kwargs.get('root_password', None) self.progress = kwargs['progress'].update_progress def unpack(self, dest): @@ -85,9 +85,7 @@ class FileSource(object): logger.info("Mapping UID/GID") utils.map_id_in_image( 1, # Number of layers - dest, - self.uid_map, - self.gid_map, + dest, self.uid_map, self.gid_map, (self.root_password is None) # Create new disk? ) |