From 9ca06bc6c29aad5fa8b1e64d518437c959fac637 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Tue, 24 Dec 2019 12:40:16 +0100 Subject: [PATCH] pmb.helpers.git.rev_parse: add path argument (!1848) --- pmb/helpers/git.py | 9 +++++---- pmb/install/file.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pmb/helpers/git.py b/pmb/helpers/git.py index 60f95a96..1c345816 100644 --- a/pmb/helpers/git.py +++ b/pmb/helpers/git.py @@ -55,12 +55,13 @@ def clone(args, name_repo, shallow=True): pmb.helpers.run.user(args, command, output="stdout") -def rev_parse(args, revision="HEAD"): - """ Run "git rev-parse" in the pmaports.git dir. +def rev_parse(args, path, revision="HEAD"): + """ Run "git rev-parse" in a specific repository dir. + :param path: to the git repository :returns: commit string like "90cd0ad84d390897efdcf881c0315747a4f3a966" """ - rev = pmb.helpers.run.user(args, ["git", "rev-parse", revision], - args.aports, output_return=True) + rev = pmb.helpers.run.user(args, ["git", "rev-parse", revision], path, + output_return=True) return rev.rstrip() diff --git a/pmb/install/file.py b/pmb/install/file.py index cb611302..b3daad51 100644 --- a/pmb/install/file.py +++ b/pmb/install/file.py @@ -24,7 +24,7 @@ import pmb.helpers.git def write_os_release(args, suffix): 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" os_release = ('PRETTY_NAME="postmarketOS {version}"\n' 'NAME="postmarketOS"\n'