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

Removes __recomended_language_packs() env argument 

That function will not require a custom environment.
Also simplified snap_dir variable assignment.
This commit is contained in:
Carlos Nihelton 2022-03-22 17:47:53 -03:00
parent a36120e0bb
commit a950d9e98f
No known key found for this signature in database
GPG Key ID: 6FE346D245197E9A
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
system_setup/server/controllers/configure.py
View File

@ -123,7 +123,7 @@ class ConfigureController(SubiquityController):
return True return True
async def __recommended_language_packs(self, lang, env) \ async def __recommended_language_packs(self, lang) \
-> Optional[List[str]]: -> Optional[List[str]]:
""" Return a list of package names recommended by """ Return a list of package names recommended by
check-language-support (or a fake list if in dryrun). check-language-support (or a fake list if in dryrun).
@ -146,18 +146,14 @@ class ConfigureController(SubiquityController):
clsLang = langCodes[0] clsLang = langCodes[0]
packages = [] packages = []
# Running that command doesn't require root. # Running that command doesn't require root.
snap_dir = os.getenv("SNAP") snap_dir = os.getenv("SNAP", default="/")
if snap_dir is None:
snap_dir = "/"
data_dir = os.path.join(snap_dir, "usr/share/language-selector") data_dir = os.path.join(snap_dir, "usr/share/language-selector")
if not os.path.exists(data_dir): if not os.path.exists(data_dir):
log.error("Misconfigured snap environment pointed L-S-C data dir" log.error("Misconfigured snap environment pointed L-S-C data dir"
" to %s", data_dir) " to %s", data_dir)
return None return None
cp = await arun_command([clsCommand, "-d", data_dir, "-l", clsLang], cp = await arun_command([clsCommand, "-d", data_dir, "-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)