jenkins-bot has submitted this change and it was merged.
Change subject: jsub: Update jsubrc and embedded options parsing
......................................................................
jsub: Update jsubrc and embedded options parsing
Update regex used to extract options from ~/.jsubrc and embedded
comments to strip trailing inline comments and allow uppercase flags.
The updated regex more closely matches the prior perl jsub parsing
behavior.
Bug: T138178
Change-Id: Ifbb2a62fc5bf192defae32c9f6146aacc83431a4
---
M jobutils/bin/jsub
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jobutils/bin/jsub b/jobutils/bin/jsub
index e00d9d4..888434d 100755
--- a/jobutils/bin/jsub
+++ b/jobutils/bin/jsub
@@ -475,7 +475,7 @@
'JOBUTILS_JSUBRC', os.path.join(homedir(), '.jsubrc'))
if os.path.exists(jsubrc):
args = []
- pat = re.compile(r'^(?P<opt>-[a-z]+)(?:\s+(?P<arg>.+)|\s*)$')
+ pat = re.compile(r'^(?P<opt>-[a-zA-Z]+)(?:\s+(?P<arg>[^#\s]+))?')
with open(jsubrc, 'r') as fh:
for line in fh:
m = pat.match(line)
@@ -513,7 +513,7 @@
This mostly matches the behavior of SGE's qsub for non-binary programs.
See '-C prefix_string' in `man qsub` for more ugly details.
"""
- pat = re.compile(r'\s*(?P<opt>-[a-z]+)(?:\s+(?P<arg>.+)|\s*)')
+ pat = re.compile(r'\s*(?P<opt>-[a-zA-Z]+)(?:\s+(?P<arg>[^#\s]+))?')
args = []
with open(namespace.program, 'r') as fh:
for line in read_script_comments(fh):
--
To view, visit https://gerrit.wikimedia.org/r/295361
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifbb2a62fc5bf192defae32c9f6146aacc83431a4
Gerrit-PatchSet: 2
Gerrit-Project: labs/toollabs
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Coren <m...@uberbox.org>
Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl>
Gerrit-Reviewer: Rush <r...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
