Dryrun won't stop configure controller due C-L-S
- Also noticed a possible unbound var in IOError handler.
This commit is contained in:
parent
a88fcdb8b3
commit
22a8219cb3
|
@ -136,19 +136,24 @@ class ConfigureController(SubiquityController):
|
||||||
return None
|
return None
|
||||||
|
|
||||||
clsLang = langCodes[0]
|
clsLang = langCodes[0]
|
||||||
|
packages = []
|
||||||
# Running that command doesn't require root.
|
# Running that command doesn't require root.
|
||||||
cp = await arun_command([clsCommand, "-l", clsLang], env=env)
|
cp = await arun_command([clsCommand, "-l", clsLang], env=env)
|
||||||
if cp.returncode != 0:
|
if cp.returncode != 0:
|
||||||
log.error('Command "%s" failed with return code %d',
|
log.error('Command "%s" failed with return code %d',
|
||||||
cp.args, cp.returncode)
|
cp.args, cp.returncode)
|
||||||
return None
|
if not self.app.opts.dry_run:
|
||||||
|
return None
|
||||||
|
|
||||||
packages = cp.stdout.strip().split(' ')
|
else:
|
||||||
# We will always have language-pack-{clsLang}-base in dryrun.
|
packages += [pkg for pkg in cp.stdout.strip().split(' ') if pkg]
|
||||||
if len(packages) == 0 and self.app.opts.dryrun:
|
|
||||||
packages += ["language-pack-{}-base".format(clsLang)]
|
|
||||||
|
|
||||||
return [pkg for pkg in packages if pkg]
|
# We will always have language-pack-{baseLang}-base in dryrun.
|
||||||
|
if len(packages) == 0 and self.app.opts.dry_run:
|
||||||
|
baseLang = clsLang.split('_')[0]
|
||||||
|
packages += ["language-pack-{}-base".format(baseLang)]
|
||||||
|
|
||||||
|
return packages
|
||||||
|
|
||||||
async def _install_check_lang_support_packages(self, lang, env) -> bool:
|
async def _install_check_lang_support_packages(self, lang, env) -> bool:
|
||||||
""" Install recommended packages.
|
""" Install recommended packages.
|
||||||
|
@ -178,8 +183,8 @@ class ConfigureController(SubiquityController):
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
except IOError:
|
except IOError as e:
|
||||||
log.error("Failed to write %s file.", archive)
|
log.error("Failed to write file.", e)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if len(packages) == 0:
|
if len(packages) == 0:
|
||||||
|
|
Loading…
Reference in New Issue