[Buildroot] [PATCH 21/27] autobuild-run: move check_version() to Builder class

Arnout Vandecappelle arnout at mind.be
Mon Jul 1 22:28:09 UTC 2019



On 29/06/2019 07:02, Atharva Lele wrote:
> Upcoming patch from Thomas needs check_version() to
> use http_url. As that is inside Builder class and check_version()
> is only used inside Builder class, move it inside the class.
> 
> Also remove the redundant call to check_version() from main().
> We already call check_version() in run_instance(). Also the fact
> that we cannot call check_version() in main() since the builder
> class object is not defined at that point.
> 
> Signed-off-by: Atharva Lele <itsatharva at gmail.com>

Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>

 Regards,
 Arnout

> ---
> Changes v1 -> v2:
>   - New patch
> ---
>  scripts/autobuild-run | 17 ++++++++---------
>  1 file changed, 8 insertions(+), 9 deletions(-)
> 
> diff --git a/scripts/autobuild-run b/scripts/autobuild-run
> index 4460887..3b8a0f6 100755
> --- a/scripts/autobuild-run
> +++ b/scripts/autobuild-run
> @@ -178,13 +178,6 @@ def log_write(logf, msg):
>      logf.write("[%s] %s\n" % (strftime("%a, %d %b %Y %H:%M:%S", localtime()), msg))
>      logf.flush()
>  
> -def check_version():
> -    with urlopen_closing('http://autobuild.buildroot.org/version') as r:
> -        version = int(decode_bytes(r.readline()).strip())
> -    if version > VERSION:
> -        print("ERROR: script version too old, please upgrade.")
> -        sys.exit(1)
> -
>  def get_branch():
>      """Returns the branch that should be built. It fetches a CSV file from
>      autobuild.buildroot.org that provides the list of branches to test
> @@ -306,6 +299,13 @@ class Builder:
>          else:
>              self.log = open(os.path.join(self.idir, "instance.log"), "a+")
>  
> +    def check_version(self):
> +        with urlopen_closing('http://autobuild.buildroot.org/version') as r:
> +            version = int(decode_bytes(r.readline()).strip())
> +        if version > VERSION:
> +            print("ERROR: script version too old, please upgrade.")
> +            sys.exit(1)
> +
>      def prepare_build(self):
>          """Prepare for the next build of the specified instance
>  
> @@ -704,7 +704,7 @@ class Builder:
>          log_write(self.log, "INFO: instance started")
>  
>          while True:
> -            check_version()
> +            self.check_version()
>  
>              ret = self.prepare_build()
>              if ret != 0:
> @@ -763,7 +763,6 @@ def main():
>      # showing error messages in another language.
>      os.environ['LC_ALL'] = 'C'
>  
> -    check_version()
>      sysinfo = SystemInfo()
>  
>      args = docopt.docopt(doc, version=VERSION)
> 


More information about the buildroot mailing list