TrueNAS/scale-build
1
0
Fork 0
mirror of https://github.com/truenas/scale-build.git synced 2025-12-24 04:50:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow specifying env variable for providing identity file path for a package

Browse Source
This commit is contained in:
Waqar Ahmed
2022-08-04 23:06:54 +05:00
parent dcd5eaecf0
commit 43bc84c079
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scale_build/packages/git.py
View File

@@ -3,7 +3,10 @@ import os
import shutil
import contextlib
from scale_build.config import BRANCH_OVERRIDES, TRUENAS_BRANCH_OVERRIDE, TRY_BRANCH_OVERRIDE
from scale_build.config import (
BRANCH_OVERRIDES, IDENTITY_FILE_PATH_OVERRIDE_SUFFIX, PACKAGE_IDENTITY_FILE_PATH_OVERRIDES,
TRUENAS_BRANCH_OVERRIDE, TRY_BRANCH_OVERRIDE,
)
from scale_build.exceptions import CallError
from scale_build.utils.git_utils import (
branch_checked_out_locally, branch_exists_in_repository, create_branch,
@@ -133,7 +136,8 @@ class GitPackageMixin:
@property
def get_identity_file_path(self):
# We need to use absolute path as git changes it's working directory with -C
return os.path.abspath(self.identity_file_path)
path = PACKAGE_IDENTITY_FILE_PATH_OVERRIDES.get(self.name) or self.identity_file_path
return os.path.abspath(path) if path else None
@property
def ssh_based_source(self):
@@ -143,17 +147,18 @@ class GitPackageMixin:
if not self.ssh_based_source:
return
if not self.identity_file_path:
if not self.get_identity_file_path:
raise CallError(
'Identity file path ("identity_file_path" attribute) must be specified '
f'in order to checkout {self.name!r}'
f'Identity file path must be specified in order to checkout {self.name!r}. It can be done either as '
'specifying "identity_file_path" attribute in manifest or providing '
f'"{self.name}{IDENTITY_FILE_PATH_OVERRIDE_SUFFIX}" env variable specifying path of the file.'
)
if not os.path.exists(self.get_identity_file_path):
raise CallError(f'{self.identity_file_path!r} identity file path does not exist')
raise CallError(f'{self.get_identity_file_path!r} identity file path does not exist')
if oct(os.stat(self.get_identity_file_path).st_mode & 0o777) != '0o600':
raise CallError(f'{self.identity_file_path!r} identity file path should have 0o600 permissions')
raise CallError(f'{self.get_identity_file_path!r} identity file path should have 0o600 permissions')
@property
def existing_branch(self):