[OE-core] [PATCH] metadata_scm.bbclass: restore capture of stderr
Christopher Larson
chris_larson at mentor.com
Tue Nov 17 18:05:06 UTC 2015
Ignore this, Paul has a pending patch for it.
On Tue, Nov 17, 2015 at 10:42 AM Christopher Larson <kergoth at gmail.com>
wrote:
> From: Christopher Larson <chris_larson at mentor.com>
>
> We don't want the user to see errors from the git commands run by
> metadata_scm
> on their console, so we need to capture or suppress stderr as well as
> stdout.
> This was the case prior to the rewrite of the git hash logic, but the 2>&1
> was
> lost when it was reworked. Bring it back to avoid messages like this in
> builds
> with non-git layers:
>
> fatal: Not a git repository (or any of the parent directories): .git
>
> Cc: Ross Burton <ross.burton at intel.com>
> Signed-off-by: Christopher Larson <chris_larson at mentor.com>
> ---
> meta/classes/metadata_scm.bbclass | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/metadata_scm.bbclass
> b/meta/classes/metadata_scm.bbclass
> index 64465fa..a8152f7 100644
> --- a/meta/classes/metadata_scm.bbclass
> +++ b/meta/classes/metadata_scm.bbclass
> @@ -69,7 +69,7 @@ def base_get_metadata_git_branch(path, d):
>
> try:
> return subprocess.check_output(["git", "rev-parse",
> "--abbrev-ref", "HEAD"],
> - cwd=path).strip()
> + cwd=path,
> stderr=subprocess.STDOUT).strip()
> except:
> return "<unknown>"
>
> @@ -78,6 +78,6 @@ def base_get_metadata_git_revision(path, d):
>
> try:
> return subprocess.check_output(["git", "rev-parse", "HEAD"],
> - cwd=path).strip()
> + cwd=path,
> stderr=subprocess.STDOUT).strip()
> except:
> return "<unknown>"
> --
> 2.2.1
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20151117/2aa87be6/attachment-0002.html>
More information about the Openembedded-core
mailing list