Openembedded Core Discussions
 help / color / mirror / Atom feed
From: "Mauro Queirós" <maurofrqueiros@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Mauro Queiros <maurofrqueiros@gmail.com>
Subject: [PATCH v2 2/3] git.py: LFS bitbake note should not be printed if need_lfs is not set.
Date: Fri, 29 May 2020 11:01:58 +0100	[thread overview]
Message-ID: <20200529100159.32393-2-maurofrqueiros@gmail.com> (raw)
In-Reply-To: <20200529100159.32393-1-maurofrqueiros@gmail.com>

The message "Repository %s has LFS content but it is not being fetched" was
being printed, even when Git-LFS was available and "lfs=1" was set. In those
situations, we want to fetch LFS content, so that message would not make sense.

Signed-off-by: Mauro Queiros <maurofrqueiros@gmail.com>
---
 lib/bb/fetch2/git.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py
index 4c7d388e..eab76a10 100644
--- a/lib/bb/fetch2/git.py
+++ b/lib/bb/fetch2/git.py
@@ -509,7 +509,7 @@ class Git(FetchMethod):
         if self._contains_lfs(ud, d, destdir):
             if need_lfs and not self._find_git_lfs(d):
                 raise bb.fetch2.FetchError("Repository %s has LFS content, install git-lfs on host to download (or set lfs=0 to ignore it)" % (repourl))
-            else:
+            elif not need_lfs:
                 bb.note("Repository %s has LFS content but it is not being fetched" % (repourl))
 
         if not ud.nocheckout:
-- 
2.17.1


  reply	other threads:[~2020-05-29 10:02 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-29 10:01 [PATCH v2 1/3] git.py: skip smudging if lfs=0 is set Mauro Queirós
2020-05-29 10:01 ` Mauro Queirós [this message]
2020-05-29 10:14   ` [PATCH v2 2/3] git.py: LFS bitbake note should not be printed if need_lfs is not set Mauro Queirós
2020-05-29 10:01 ` [PATCH v2 3/3] git.py: Use the correct branch to check if the repository has LFS objects Mauro Queirós
2020-05-29 10:14   ` Mauro Queirós
2020-05-29 10:14 ` [PATCH v2 1/3] git.py: skip smudging if lfs=0 is set Mauro Queirós
2020-05-29 10:32 ` ✗ patchtest: failure for "[v2] git.py: skip smudging if ..." and 2 more Patchwork

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=20200529100159.32393-2-maurofrqueiros@gmail.com \
    --to=maurofrqueiros@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox