synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pmb.helpers.git.rev_parse: add path argument (!1848)

This commit is contained in:
Oliver Smith 2019-12-24 12:40:16 +01:00 committed by Alexey Min
parent 2b1dfe7cfc
commit 9ca06bc6c2
No known key found for this signature in database
GPG Key ID: EBF5ECFFFEE34DED
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pmb/helpers/git.py
View File

@ -55,12 +55,13 @@ def clone(args, name_repo, shallow=True):
pmb.helpers.run.user(args, command, output="stdout") pmb.helpers.run.user(args, command, output="stdout")
def rev_parse(args, revision="HEAD"): def rev_parse(args, path, revision="HEAD"):
""" Run "git rev-parse" in the pmaports.git dir. """ Run "git rev-parse" in a specific repository dir.
:param path: to the git repository
:returns: commit string like "90cd0ad84d390897efdcf881c0315747a4f3a966" :returns: commit string like "90cd0ad84d390897efdcf881c0315747a4f3a966"
""" """
rev = pmb.helpers.run.user(args, ["git", "rev-parse", revision], rev = pmb.helpers.run.user(args, ["git", "rev-parse", revision], path,
args.aports, output_return=True) output_return=True)
return rev.rstrip() return rev.rstrip()

2
pmb/install/file.py
View File

@ -24,7 +24,7 @@ import pmb.helpers.git
def write_os_release(args, suffix): def write_os_release(args, suffix):
logging.info("(" + suffix + ") write /etc/os-release") logging.info("(" + suffix + ") write /etc/os-release")
revision = pmb.helpers.git.rev_parse(args) revision = pmb.helpers.git.rev_parse(args, args.aports)
filepath = args.work + "/chroot_" + suffix + "/tmp/os-release" filepath = args.work + "/chroot_" + suffix + "/tmp/os-release"
os_release = ('PRETTY_NAME="postmarketOS {version}"\n' os_release = ('PRETTY_NAME="postmarketOS {version}"\n'
'NAME="postmarketOS"\n' 'NAME="postmarketOS"\n'