Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Atharva Lele <itsatharva@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v3 21/31] autobuild-run: move check_version() to Builder class
Date: Sun,  7 Jul 2019 10:58:21 +0530	[thread overview]
Message-ID: <20190707052831.9469-21-itsatharva@gmail.com> (raw)
In-Reply-To: <20190707052831.9469-1-itsatharva@gmail.com>

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@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
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 8a0bec7..391c1dc 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
 
@@ -706,7 +706,7 @@ class Builder:
         log_write(self.log, "INFO: instance started")
 
         while True:
-            check_version()
+            self.check_version()
 
             ret = self.prepare_build()
             if ret != 0:
@@ -765,7 +765,6 @@ def main():
     # showing error messages in another language.
     os.environ['LC_ALL'] = 'C'
 
-    check_version()
     sysinfo = SystemInfo()
 
     args = docopt.docopt(doc, version=VERSION)
-- 
2.22.0

  parent reply	other threads:[~2019-07-07  5:28 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-07  5:28 [Buildroot] [PATCH v3 01/31] autobuild-run: introduce Builder class Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 02/31] autobuild-run: move instance variable from kwargs to " Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 03/31] autobuild-run: move njobs " Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 04/31] autobuild-run: move sysinfo " Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 05/31] autobuild-run: move http variables " Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 06/31] autobuild-run: move submitter " Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 07/31] autobuild-run: move make_opts " Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 08/31] autobuild-run: move niceness " Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 09/31] autobuild-run: move toolchains_csv " Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 10/31] autobuild-run: move repo " Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 11/31] autobuild-run: move upload variable " Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 12/31] autobuild-run: move buildpid " Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 13/31] autobuild-run: move debug " Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 14/31] autobuild-run: define instance directory as a part of " Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 15/31] autobuild-run: move log variable to " Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 16/31] autobuild-run: remove kwargs argument from function calls and definitions Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 17/31] autobuild-run: define source directory as part of Builder class Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 18/31] autobuild-run: define download " Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 19/31] autobuild-run: define output " Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 20/31] autobuild-run: define results " Atharva Lele
2019-07-07  5:28 ` Atharva Lele [this message]
2019-07-07  5:28 ` [Buildroot] [PATCH v3 22/31] autobuild-run: move get_branch() to " Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 23/31] scripts/autobuild-run: make the HTTP URL really configurable Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 24/31] autobuild-run: create reason file on build failures Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 25/31] autobuild-run: account for reproducibility failures when creating the reason file Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 26/31] web/import.inc.php: support reading failure reason from " Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 27/31] scripts/autobuild-run: support changing repo Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 28/31] autobuild-run: modify do_build() to accept outputdir as argument Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 29/31] autobuild-run: define different output directory for reproducible builds Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 30/31] autobuild-run: use different output directories for reproducible builds testing Atharva Lele
2019-07-07  5:28 ` [Buildroot] [PATCH v3 31/31] autobuild-run: make prepare_build() clean the output directory used for reproducibility testing Atharva Lele

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=20190707052831.9469-21-itsatharva@gmail.com \
    --to=itsatharva@gmail.com \
    --cc=buildroot@busybox.net \
    /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