Skip to content

Conversation

@vespos
Copy link
Contributor

@vespos vespos commented May 5, 2025

Description

Fix bug in the path check for the epicsArch softlink creation

Motivation and Context

Softlink creation was buggy because of the faulty check

How Has This Been Tested?

This worked as expected:

(pcds-5.9.1) [espov@psbuild-rhel7-02  hutch-python]$ epicsarch-qs xppl1006821 --softlink -l DEBUG --hutch xpp
DEBUG:hutch_python.epics_arch:UpdateFile: qs_data:
['* mrx', 'XPP:USR:MMS:23', '* wp_1300nm', 'XPP:USR:MMN:05', '* dstms_angle', 'XPP:USR:MMN:01', '* samy', 'XPP:USR:MMS:25', '* eta', 'XPP:USR:MMS:19', '* samx', 'XPP:USR:MMS:18', '* muu', 'XPP:USR:MMS:17', '* mry', 'XPP:USR:MMS:22', '* wp_800nm', 'XPP:USR:MMN:06', '* mrz', 'XPP:USR:MMS:21', '* samz', 'XPP:USR:MMS:24', '* chi', 'XPP:USR:MMS:20', '* pol_800nm', 'XPP:USR:MMN:08', '* pr_v', 'XPP:MCS2:01:m7']
DEBUG:hutch_python.epics_arch:
Path: /cds/group/pcds/dist/pds/xpp/misc/
DEBUG:hutch_python.epics_arch:
AF Path: /cds/group/pcds/dist/pds/xpp/misc/epicsArch_xppl1006821.txt
DEBUG:hutch_python.epics_arch:UpdateFile: Path exists and archfile exists

DEBUG:hutch_python.epics_arch:!Alias Match in questionnaire and archfile! Updating PV: *chi, XPP:USR:MMS:20
DEBUG:hutch_python.epics_arch:!Alias Match in questionnaire and archfile! Updating PV: *dstms_angle, XPP:USR:MMN:01
DEBUG:hutch_python.epics_arch:!Alias Match in questionnaire and archfile! Updating PV: *eta, XPP:USR:MMS:19
DEBUG:hutch_python.epics_arch:!Alias Match in questionnaire and archfile! Updating PV: *mrx, XPP:USR:MMS:23
DEBUG:hutch_python.epics_arch:!Alias Match in questionnaire and archfile! Updating PV: *mry, XPP:USR:MMS:22
DEBUG:hutch_python.epics_arch:!Alias Match in questionnaire and archfile! Updating PV: *mrz, XPP:USR:MMS:21
DEBUG:hutch_python.epics_arch:!Alias Match in questionnaire and archfile! Updating PV: *muu, XPP:USR:MMS:17
DEBUG:hutch_python.epics_arch:!Alias Match in questionnaire and archfile! Updating PV: *pol_800nm, XPP:USR:MMN:08
DEBUG:hutch_python.epics_arch:!Alias Match in questionnaire and archfile! Updating PV: *pr_v, XPP:MCS2:01:m7
DEBUG:hutch_python.epics_arch:!Alias Match in questionnaire and archfile! Updating PV: *samx, XPP:USR:MMS:18
DEBUG:hutch_python.epics_arch:!Alias Match in questionnaire and archfile! Updating PV: *samy, XPP:USR:MMS:25
DEBUG:hutch_python.epics_arch:!Alias Match in questionnaire and archfile! Updating PV: *samz, XPP:USR:MMS:24
DEBUG:hutch_python.epics_arch:!Alias Match in questionnaire and archfile! Updating PV: *wp_1300nm, XPP:USR:MMN:05
DEBUG:hutch_python.epics_arch:!Alias Match in questionnaire and archfile! Updating PV: *wp_800nm, XPP:USR:MMN:06
DEBUG:hutch_python.epics_arch:
Updated Arch List: ['*chi', 'XPP:USR:MMS:20', '*dstms_angle', 'XPP:USR:MMN:01', '*eta', 'XPP:USR:MMS:19', '*mrx', 'XPP:USR:MMS:23', '*mry', 'XPP:USR:MMS:22', '*mrz', 'XPP:USR:MMS:21', '*muu', 'XPP:USR:MMS:17', '*pol_800nm', 'XPP:USR:MMN:08', '*pr_v', 'XPP:MCS2:01:m7', '*samx', 'XPP:USR:MMS:18', '*samy', 'XPP:USR:MMS:25', '*samz', 'XPP:USR:MMS:24', '*wp_1300nm', 'XPP:USR:MMN:05', '*wp_800nm', 'XPP:USR:MMN:06']

Where Has This Been Documented?

N/A

Pre-merge checklist

  • Code works interactively (a real hutch config file can be loaded)
  • Code contains descriptive docstrings, including context and API
  • New/changed functions and methods are covered in the test suite where possible
  • Test suite passes locally
  • Test suite passes on GitHub Actions
  • Ran docs/pre-release-notes.sh and created a pre-release documentation page
  • Pre-release docs include context, functional descriptions, and contributors as appropriate

@vespos vespos requested a review from a team as a code owner May 5, 2025 23:20
Copy link
Contributor

@tangkong tangkong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me, simple sensible change. Just a small change to get the docs build working, but otherwise I think this is good to go.

Thanks for catching this!

tangkong
tangkong previously approved these changes May 6, 2025
Copy link
Contributor

@tangkong tangkong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 3.12 test failure is unrelated to this change, and is something we need to look at generally. This looks good to me now, thanks!

Ack, one more small change


Contributors
------------
- espov
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- espov
- vesops

These are github usernames, as unclear as it is

@vespos vespos merged commit 8097f72 into pcdshub:master May 6, 2025
10 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants