All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christopher Larson <kergoth@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Christopher Larson <chris_larson@mentor.com>
Subject: [PATCH] metadata_scm.bbclass: restore capture of stderr
Date: Tue, 17 Nov 2015 10:42:06 -0700	[thread overview]
Message-ID: <1447782126-10038-1-git-send-email-kergoth@gmail.com> (raw)

From: Christopher Larson <chris_larson@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@intel.com>
Signed-off-by: Christopher Larson <chris_larson@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



             reply	other threads:[~2015-11-17 17:42 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-17 17:42 Christopher Larson [this message]
2015-11-17 18:05 ` [PATCH] metadata_scm.bbclass: restore capture of stderr Christopher Larson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1447782126-10038-1-git-send-email-kergoth@gmail.com \
    --to=kergoth@gmail.com \
    --cc=chris_larson@mentor.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.