Skip to content

Make ioc -m/--macros independent of -d/--database order #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jacquelinegarrahan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make ioc -m/--macros independent of -d/--database order #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/python/epicscorelibs/ioc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,17 @@ def out(msg, *args):
pva_dbd_load = (("PVAServerRegister.dbd", DEFAULT_DBD_PATH), ("qsrv.dbd", DEFAULT_DBD_PATH))
pva_dso_load = ("epicscorelibs.lib.pvAccessIOC", "epicscorelibs.lib.qsrv",)
def main(extra_dbd_load=pva_dbd_load, extra_dso_load=pva_dso_load):
class DbAction(argparse.Action):
def __call__(self, parser, ns, values, opt):
ns.database.append((values, ns.macros))
parser = argparse.ArgumentParser(
description="Run a cut down softIoc by calling the functions from Python")
parser.add_argument('-m', '--macros', default="",
help="Macro definitions when expanding database, e.g. -d \"macro=value,macro2=value2\"")
parser.add_argument('-d', '--database', default=[], action=DbAction,
parser.add_argument('-d', '--database', default=[], action='append',
help="Path to database file to load")
args = parser.parse_args()
start_ioc(dbs=args.database, extra_dbd_load=extra_dbd_load, extra_dso_load=extra_dso_load)
# Apply the macros to every database regardless of -m/-d order on the
# command line (matches the documented "-d db -m macro=value" usage).
dbs = [(database, args.macros) for database in args.database]
start_ioc(dbs=dbs, extra_dbd_load=extra_dbd_load, extra_dso_load=extra_dso_load)
code.interact(local={
'exit':sys.exit,
'ioc':ioc,
Expand Down