TrueNAS/scale-build
1
0
Fork 0
mirror of https://github.com/truenas/scale-build.git synced 2025-12-20 02:49:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly check debian/control exists after running predeps commands

Browse Source
This commit is contained in:
Waqar Ahmed
2023-05-05 07:01:02 +04:00
parent 4a360b5710
commit 19cf5c9d12
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scale_build/packages/build.py
View File

@@ -73,11 +73,6 @@ class BuildPackageMixin:
self.execute_pre_depends_commands() self.execute_pre_depends_commands()
if not os.path.exists(os.path.join(self.package_source_with_chroot, 'debian/control')):
raise CallError(
f'Missing debian/control file for {self.name} in {self.package_source_with_chroot}'
)
self.run_in_chroot(f'cd {self.package_source} && mk-build-deps --build-dep', 'Failed mk-build-deps') self.run_in_chroot(f'cd {self.package_source} && mk-build-deps --build-dep', 'Failed mk-build-deps')
self.run_in_chroot(f'cd {self.package_source} && apt install -y ./*.deb', 'Failed install build deps') self.run_in_chroot(f'cd {self.package_source} && apt install -y ./*.deb', 'Failed install build deps')
@@ -157,6 +152,11 @@ class BuildPackageMixin:
f'cd {self.package_source} && {predep_cmd}', 'Failed to execute predep command' f'cd {self.package_source} && {predep_cmd}', 'Failed to execute predep command'
) )
if not os.path.exists(os.path.join(self.package_source_with_chroot, 'debian/control')):
raise CallError(
f'Missing debian/control file for {self.name} in {self.package_source_with_chroot}'
)
@property @property
def build_command(self): def build_command(self):
if self.buildcmd: if self.buildcmd: