pmb.helpers.git.rev_parse: add path argument (!1848)
This commit is contained in:
parent
2b1dfe7cfc
commit
9ca06bc6c2
|
@ -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()
|
||||||
|
|
|
@ -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'
|
||||||
|
|
Loading…
Reference in New Issue