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

Allow specifying a default for ssh based identity path

Browse Source
This commit is contained in:
Waqar Ahmed
2022-08-06 21:00:35 +05:00
parent cd965e95ca
commit e52947ce83
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scale_build/packages/git.py
View File

@@ -13,7 +13,7 @@ from scale_build.utils.git_utils import (
retrieve_git_remote_and_sha, retrieve_git_branch, update_git_manifest
)
from scale_build.utils.logger import LoggingContext
from scale_build.utils.manifest import SSH_SOURCE_REGEX
from scale_build.utils.manifest import get_manifest, SSH_SOURCE_REGEX
from scale_build.utils.paths import GIT_LOG_DIR_NAME, GIT_LOG_DIR
from scale_build.utils.run import run
@@ -136,7 +136,9 @@ class GitPackageMixin:
@property
def get_identity_file_path(self):
# We need to use absolute path as git changes it's working directory with -C
path = PACKAGE_IDENTITY_FILE_PATH_OVERRIDES.get(self.name) or self.identity_file_path
path = (PACKAGE_IDENTITY_FILE_PATH_OVERRIDES.get(self.name) or
self.identity_file_path or
get_manifest()['identity_file_path_default'])
return os.path.abspath(path) if path else None
@property