alt/cloud-build
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix types

Browse Source
This commit is contained in:
Mikhail Gordeev 2020-04-25 00:50:07 +03:00
parent f094c54917
commit f3728292d7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cloud_build/cloud_build.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/python3 #!/usr/bin/python3
from typing import Dict, List, Union from typing import Dict, List, Union, Optional
from pathlib import Path from pathlib import Path
import contextlib import contextlib
@ -492,7 +492,7 @@ Dir::Etc::preferencesparts "/var/empty";
branch: str, branch: str,
arch: str, arch: str,
kind: str kind: str
) -> Path: ) -> Optional[Path]:
self.ensure_mkimage_profiles() self.ensure_mkimage_profiles()
target = f'{target}_{self.escape_branch(branch)}' target = f'{target}_{self.escape_branch(branch)}'
@ -500,6 +500,7 @@ Dir::Etc::preferencesparts "/var/empty";
full_target = f'{target}.{kind}' full_target = f'{target}.{kind}'
tarball_name = f'{image}-{arch}.{kind}' tarball_name = f'{image}-{arch}.{kind}'
tarball_path = self.out_dir / tarball_name tarball_path = self.out_dir / tarball_name
result = None
apt_dir = self.work_dir / 'apt' apt_dir = self.work_dir / 'apt'
with self.pushd(self.work_dir / 'mkimage-profiles'): with self.pushd(self.work_dir / 'mkimage-profiles'):
if not self.should_rebuild(tarball_path): if not self.should_rebuild(tarball_path):
@ -518,11 +519,11 @@ Dir::Etc::preferencesparts "/var/empty";
if os.path.exists(tarball_path): if os.path.exists(tarball_path):
self.info(f'End building of {full_target} {arch}') self.info(f'End building of {full_target} {arch}')
result = tarball_path
else: else:
self.build_failed(full_target, arch) self.build_failed(full_target, arch)
tarball_path = None
return tarball_path return result
def image_path( def image_path(
self, self,