diff options
author | Michael Opdenacker <michael.opdenacker@bootlin.com> | 2024-04-12 11:02:25 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-14 06:31:45 +0100 |
commit | d57e17425e05e1a415536a48569af39531a533a8 (patch) | |
tree | ffaa8fc69f97140f5aa2df6e64b3d83b91ec1230 | |
parent | 4b1ef692a9db79321be765c8e38de953ac52a7e1 (diff) | |
download | poky-d57e17425e05e1a415536a48569af39531a533a8.tar.gz |
bitbake: bitbake-prserv: replace deprecated optparse by argparse
optparse is deprecated since Python 2.7
Note that this is neither supposed to change the options
supported by bitbake-prserv nor the way they are interpreted.
Note that in the "--help" output, long options are now reported
for example as "--host HOST" instead of "--host=HOST" but
both are equivalent anyway, as they already were with optparse.
(Bitbake rev: 434cd00a9e5a8ef32088f1a587005adf910a92eb)
Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com>
Cc: Joshua Watt <JPEWhacker@gmail.com>
Cc: Tim Orling <ticotimo@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | bitbake/bin/bitbake-prserv | 82 |
1 files changed, 55 insertions, 27 deletions
diff --git a/bitbake/bin/bitbake-prserv b/bitbake/bin/bitbake-prserv index 8c3808fb20..ad0a069401 100755 --- a/bitbake/bin/bitbake-prserv +++ b/bitbake/bin/bitbake-prserv | |||
@@ -7,7 +7,7 @@ | |||
7 | 7 | ||
8 | import os | 8 | import os |
9 | import sys,logging | 9 | import sys,logging |
10 | import optparse | 10 | import argparse |
11 | import warnings | 11 | import warnings |
12 | warnings.simplefilter("default") | 12 | warnings.simplefilter("default") |
13 | 13 | ||
@@ -16,40 +16,68 @@ sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(__file__)), "lib | |||
16 | import prserv | 16 | import prserv |
17 | import prserv.serv | 17 | import prserv.serv |
18 | 18 | ||
19 | __version__="1.0.0" | 19 | VERSION = "1.1.0" |
20 | 20 | ||
21 | PRHOST_DEFAULT="0.0.0.0" | 21 | PRHOST_DEFAULT="0.0.0.0" |
22 | PRPORT_DEFAULT=8585 | 22 | PRPORT_DEFAULT=8585 |
23 | 23 | ||
24 | def main(): | 24 | def main(): |
25 | parser = optparse.OptionParser( | 25 | parser = argparse.ArgumentParser( |
26 | version="Bitbake PR Service Core version %s, %%prog version %s" % (prserv.__version__, __version__), | 26 | description="BitBake PR Server. Version=%s" % VERSION, |
27 | usage = "%prog < --start | --stop > [options]") | 27 | formatter_class=argparse.RawTextHelpFormatter) |
28 | 28 | ||
29 | parser.add_option("-f", "--file", help="database filename(default: prserv.sqlite3)", action="store", | 29 | parser.add_argument( |
30 | dest="dbfile", type="string", default="prserv.sqlite3") | 30 | "-f", |
31 | parser.add_option("-l", "--log", help="log filename(default: prserv.log)", action="store", | 31 | "--file", |
32 | dest="logfile", type="string", default="prserv.log") | 32 | default="prserv.sqlite3", |
33 | parser.add_option("--loglevel", help="logging level, i.e. CRITICAL, ERROR, WARNING, INFO, DEBUG", | 33 | help="database filename (default: prserv.sqlite3)", |
34 | action = "store", type="string", dest="loglevel", default = "INFO") | 34 | ) |
35 | parser.add_option("--start", help="start daemon", | 35 | parser.add_argument( |
36 | action="store_true", dest="start") | 36 | "-l", |
37 | parser.add_option("--stop", help="stop daemon", | 37 | "--log", |
38 | action="store_true", dest="stop") | 38 | default="prserv.log", |
39 | parser.add_option("--host", help="ip address to bind", action="store", | 39 | help="log filename(default: prserv.log)", |
40 | dest="host", type="string", default=PRHOST_DEFAULT) | 40 | ) |
41 | parser.add_option("--port", help="port number(default: 8585)", action="store", | 41 | parser.add_argument( |
42 | dest="port", type="int", default=PRPORT_DEFAULT) | 42 | "--loglevel", |
43 | parser.add_option("-r", "--read-only", help="open database in read-only mode", | 43 | default="INFO", |
44 | action="store_true") | 44 | help="logging level, i.e. CRITICAL, ERROR, WARNING, INFO, DEBUG", |
45 | ) | ||
46 | parser.add_argument( | ||
47 | "--start", | ||
48 | action="store_true", | ||
49 | help="start daemon", | ||
50 | ) | ||
51 | parser.add_argument( | ||
52 | "--stop", | ||
53 | action="store_true", | ||
54 | help="stop daemon", | ||
55 | ) | ||
56 | parser.add_argument( | ||
57 | "--host", | ||
58 | help="ip address to bind", | ||
59 | default=PRHOST_DEFAULT, | ||
60 | ) | ||
61 | parser.add_argument( | ||
62 | "--port", | ||
63 | type=int, | ||
64 | default=PRPORT_DEFAULT, | ||
65 | help="port number (default: 8585)", | ||
66 | ) | ||
67 | parser.add_argument( | ||
68 | "-r", | ||
69 | "--read-only", | ||
70 | action="store_true", | ||
71 | help="open database in read-only mode", | ||
72 | ) | ||
45 | 73 | ||
46 | options, args = parser.parse_args(sys.argv) | 74 | args = parser.parse_args() |
47 | prserv.init_logger(os.path.abspath(options.logfile),options.loglevel) | 75 | prserv.init_logger(os.path.abspath(args.log), args.loglevel) |
48 | 76 | ||
49 | if options.start: | 77 | if args.start: |
50 | ret=prserv.serv.start_daemon(options.dbfile, options.host, options.port,os.path.abspath(options.logfile), options.read_only) | 78 | ret=prserv.serv.start_daemon(args.file, args.host, args.port, os.path.abspath(args.log), args.read_only) |
51 | elif options.stop: | 79 | elif args.stop: |
52 | ret=prserv.serv.stop_daemon(options.host, options.port) | 80 | ret=prserv.serv.stop_daemon(args.host, args.port) |
53 | else: | 81 | else: |
54 | ret=parser.print_help() | 82 | ret=parser.print_help() |
55 | return ret | 83 | return ret |