-
Notifications
You must be signed in to change notification settings - Fork 11
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.
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
Adding options for ioc main #24
base: master
Are you sure you want to change the base?
Adding options for ioc main #24
Conversation
CI failures on OSX are unrelated (#25) to this PR. |
Are you able to squash these commits into only a couple please? |
5962b38
to
e1284a4
Compare
I've gone ahead and squashed the commits into a single one as requested. Please feel free to let me know if there's anything else you'd like me to adjust! |
CI is broken due to |
@ZohebShaikh can you rebase this on main so we can try the CI again? |
e1284a4
to
8ac8589
Compare
8ac8589
to
7f86378
Compare
@OCopping I noticed the CI is passing. Could we proceed with the merge? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mdavidsaver I'm happy with this, can we merge?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To be honest, I'm not enthused about this start_ioc()
being supported public API. However, I understand the appeal.
Maybe a less bad option would be adding two arguments pvAccess=True
and iocInit=True
?
Passing pvAccess=False
would skip loading pvAccessIOC
. iocInit=False
would skip calling iocInit()
, which allows the caller of start_ioc()
to to load addition dbd, libraries, run arbitrary ioc shell commands, then call iocInit()
src/python/epicscorelibs/ioc.py
Outdated
@@ -63,7 +64,7 @@ def ioc(cmd): | |||
''' | |||
return iocshCmd(cmd.encode()) | |||
|
|||
def start_ioc(database=None, macros='', dbs=None): | |||
def start_ioc(extra_dbd_load, extra_dso_load, database=None, macros='', dbs=None): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
New arguments should be appended, with a default which preserves the current behavior.
... or maybe this becomes a new function |
To be clear, the only change I insist on is reordering of arguments to preserve backwards compatibility. |
This PR is created in relation to this issue epics-base/pvxs#49