From 1e98f1304b745eb6cde2be0ff862f2a48adc1233 Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Tue, 27 Feb 2018 23:48:01 +0000 Subject: 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 --- src/virtBootstrap/sources/docker_source.py | 3 +-- src/virtBootstrap/sources/file_source.py | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src') 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? ) -- cgit