[oe-commits] [bitbake] 01/02: fetch2: Unify BB_FETCH_PREMIRRORONLY

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 85a0d22835588e9ad8ec29d88a8115227e88420c
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Mon Mar 25 16:10:57 2019 +0800

    fetch2: Unify BB_FETCH_PREMIRRORONLY
    
    The fetch2/__init__.py checks whether "BB_FETCH_PREMIRRORONLY" == "1", but
    fetch2/git.py and hg.py checks whether it is None, this makes it discontinuous,
    and BB_FETCH_PREMIRRORONLY = "0" doens't work as expected in the later case,
    so unify it to the previous one. (As BB_NO_NETWORK does).
    
    And also use bb.utils.to_boolean() to make them consistent.
    
    Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/fetch2/__init__.py | 2 +-
 lib/bb/fetch2/git.py      | 2 +-
 lib/bb/fetch2/hg.py       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index 26ad388..6445184 100644
--- a/lib/bb/fetch2/__init__.py
+++ b/lib/bb/fetch2/__init__.py
@@ -1642,7 +1642,7 @@ class Fetch(object):
             urls = self.urls
 
         network = self.d.getVar("BB_NO_NETWORK")
-        premirroronly = (self.d.getVar("BB_FETCH_PREMIRRORONLY") == "1")
+        premirroronly = bb.utils.to_boolean(self.d.getVar("BB_FETCH_PREMIRRORONLY"))
 
         for u in urls:
             ud = self.ud[u]
diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py
index cf8bee7..8185bf4 100644
--- a/lib/bb/fetch2/git.py
+++ b/lib/bb/fetch2/git.py
@@ -318,7 +318,7 @@ class Git(FetchMethod):
     def try_premirror(self, ud, d):
         # If we don't do this, updating an existing checkout with only premirrors
         # is not possible
-        if d.getVar("BB_FETCH_PREMIRRORONLY") is not None:
+        if bb.utils.to_boolean(d.getVar("BB_FETCH_PREMIRRORONLY")):
             return True
         if os.path.exists(ud.clonedir):
             return False
diff --git a/lib/bb/fetch2/hg.py b/lib/bb/fetch2/hg.py
index 936d043..5a2985e 100644
--- a/lib/bb/fetch2/hg.py
+++ b/lib/bb/fetch2/hg.py
@@ -99,7 +99,7 @@ class Hg(FetchMethod):
     def try_premirror(self, ud, d):
         # If we don't do this, updating an existing checkout with only premirrors
         # is not possible
-        if d.getVar("BB_FETCH_PREMIRRORONLY") is not None:
+        if bb.utils.to_boolean(d.getVar("BB_FETCH_PREMIRRORONLY")):
             return True
         if os.path.exists(ud.moddir):
             return False

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.