diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-04-28 15:15:57 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-28 17:48:26 +0100 |
commit | 2fe7d8c574ddf6a30278cff1a5a5c4089dc56d6d (patch) | |
tree | 8cc0c93a991c64fecf77820270657d1f6a603985 | |
parent | c8e2a40c4e9865ebef9936d23644f2602a5c90f5 (diff) | |
download | bitbake-contrib-2fe7d8c574ddf6a30278cff1a5a5c4089dc56d6d.tar.gz |
bitbake: Check if bitbake versions match
Bitbake program and core versions must match.
Moved __version__ from main.py back to bin/bitbake.
Implemented check for version match in bin/bitbake.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
tbs
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | bin/bitbake | 4 | ||||
-rwxr-xr-x | lib/bb/main.py | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/bin/bitbake b/bin/bitbake index 3e1ca6286..88ac8c34c 100755 --- a/bin/bitbake +++ b/bin/bitbake @@ -35,7 +35,11 @@ except RuntimeError as exc: from bb import cookerdata from bb.main import bitbake_main, BitBakeConfigParameters, BBMainException +__version__ = "1.27.0" + if __name__ == "__main__": + if __version__ != bb.__version__: + sys.exit("Bitbake core version and program version mismatch!") try: ret = bitbake_main(BitBakeConfigParameters(sys.argv), cookerdata.CookerConfiguration()) diff --git a/lib/bb/main.py b/lib/bb/main.py index 2019d5014..49dc8d5b5 100755 --- a/lib/bb/main.py +++ b/lib/bb/main.py @@ -36,7 +36,6 @@ from bb import ui from bb import server from bb import cookerdata -__version__ = "1.27.0" logger = logging.getLogger("BitBake") class BBMainException(Exception): @@ -83,7 +82,7 @@ class BitBakeConfigParameters(cookerdata.ConfigParameters): def parseCommandLine(self, argv=sys.argv): parser = optparse.OptionParser( - version = "BitBake Build Tool Core version %s, %%prog version %s" % (bb.__version__, __version__), + version = "BitBake Build Tool Core version %s" % bb.__version__, usage = """%prog [options] [recipename/target ...] Executes the specified task (default is 'build') for a given set of target recipes (.bb files). |