[bitbake-devel] [PATCH 2/2] fetch2: Unify BB_FETCH_PREMIRRORONLY

[Richard Purdie]

On Wed, 2019-03-20 at 14:40 +0800, Robert Yang wrote:
> 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).
> 
> Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
> ---
>  bitbake/lib/bb/fetch2/git.py | 2 +-
>  bitbake/lib/bb/fetch2/hg.py  | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/bitbake/lib/bb/fetch2/git.py
> b/bitbake/lib/bb/fetch2/git.py
> index 1a8ebe3..e021f33 100644
> --- a/bitbake/lib/bb/fetch2/git.py
> +++ b/bitbake/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 d.getVar("BB_FETCH_PREMIRRORONLY") == "1":
>              return True
>          if os.path.exists(ud.clonedir):
>              return False
> diff --git a/bitbake/lib/bb/fetch2/hg.py
> b/bitbake/lib/bb/fetch2/hg.py
> index 936d043..5a3db92 100644
> --- a/bitbake/lib/bb/fetch2/hg.py
> +++ b/bitbake/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 d.getVar("BB_FETCH_PREMIRRORONLY") == "1":
>              return True
>          if os.path.exists(ud.moddir):
>              return False

Can we use bb.utils.to_boolean() in all cases to be consistent please?

Cheers,

Richard