StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Linting issues fixed.

This commit is contained in:
Carlos Nihelton 2021-10-28 15:54:07 -03:00
parent 2125acffe6
commit 10f209ad81
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
system_setup/cmd/server.py
View File

@ -38,8 +38,8 @@ def make_server_args_parser():
parser.add_argument('--autoinstall', action='store') parser.add_argument('--autoinstall', action='store')
parser.add_argument('--prefill', parser.add_argument('--prefill',
dest='prefill', dest='prefill',
help='Prefills UI models with data provided in a prefill.yaml' \ help='Prefills UI models with data provided in'
' file yet allowing overrides.') ' a prefill.yaml file yet allowing overrides.')
return parser return parser
@ -84,13 +84,15 @@ def main():
if os.path.exists(prefillFile): if os.path.exists(prefillFile):
statInfo = os.stat(prefillFile) statInfo = os.stat(prefillFile)
mode = statInfo.st_mode mode = statInfo.st_mode
isRegularFile = (stat.S_ISREG(mode)!=0) isRegularFile = (stat.S_ISREG(mode) != 0)
if not isRegularFile: if not isRegularFile:
logger.error('"{}" is not a regular file. Option will be ignored.'.format(prefillFile)) logger.error('"{}" is not a regular file.'
' Option will be ignored.'.format(prefillFile))
opts.prefill = None opts.prefill = None
else: else:
logger.error('Prefill file "{}" does not exist. Option will be ignored.'.format(prefillFile))
opts.prefill = None opts.prefill = None
logger.error('Prefill file "{}" does not exist.'
' Option will be ignored.'.format(prefillFile))
server = SystemSetupServer(opts, block_log_dir) server = SystemSetupServer(opts, block_log_dir)

3
system_setup/cmd/tui.py
View File

@ -97,7 +97,8 @@ def main():
server_proc = subprocess.Popen( server_proc = subprocess.Popen(
server_cmd, stdout=server_output, stderr=subprocess.STDOUT) server_cmd, stdout=server_output, stderr=subprocess.STDOUT)
opts.server_pid = str(server_proc.pid) opts.server_pid = str(server_proc.pid)
print("running server pid {} with args: {}".format(server_proc.pid, server_cmd)) print("running server pid {} with args: {}"
.format(server_proc.pid, server_cmd))
elif opts.server_pid is not None: elif opts.server_pid is not None:
print("reconnecting to server pid {}".format(opts.server_pid)) print("reconnecting to server pid {}".format(opts.server_pid))

4
system_setup/common/wsl_utils.py
View File

@ -15,10 +15,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import os import os
import logging
import subprocess
log = logging.getLogger("subiquity.system_setup.common.wsl_utils")
def is_reconfigure(is_dryrun): def is_reconfigure(is_dryrun):

5
system_setup/models/system_setup.py
View File

@ -63,9 +63,8 @@ class SystemSetupModel(SubiquityModel):
self.wslconfadvanced = WSLConfigurationAdvancedModel() self.wslconfadvanced = WSLConfigurationAdvancedModel()
if prefillInfo: if prefillInfo:
welcome = prefillInfo.get('Welcome',{'lang': None}) welcome = prefillInfo.get('Welcome', {'lang': None})
if welcome is not None and welcome.get('lang') is not None:
if welcome != None and welcome.get('lang') is not None:
self.locale.selected_language = welcome['lang'] self.locale.selected_language = welcome['lang']
log.debug('Prefill Language: {}' log.debug('Prefill Language: {}'
.format(self.locale.selected_language)) .format(self.locale.selected_language))