Skip to content

Commit

Permalink
Fix outds regex and use 3.3.4.rc1 in makeruntime
Browse files Browse the repository at this point in the history
  • Loading branch information
mmascher committed Feb 19, 2014
1 parent b651979 commit ae35b77
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions bin/htcondor_make_runtime.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ STARTDIR=$PWD/tmp/runtime
CRAB3_VERSION=3.3.0-pre1

WMCOREDIR=$STARTDIR/WMCore
WMCOREVER=0.9.86
WMCOREVER=0.9.92
WMCOREREPO=dmwm

CRABSERVERDIR=$STARTDIR/CRABServer
CRABSERVERVER=3.3.4.pre.stageout.9
CRABSERVERVER=3.3.4.rc1
CRABSERVERREPO=dmwm

[[ -d $STARTDIR ]] || mkdir -p $STARTDIR
Expand Down
2 changes: 1 addition & 1 deletion src/python/CRABInterface/Regexps.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# TODO: we should start replacing most of the regex here with what we have in WMCore.Lexicon
# (this probably requires to adapt something on Lexicon)
wfBase = r"^[a-zA-Z0-9\.\-_:]{1,%s}$"
pNameRE = r"(?=.{0,400}$)[a-zA-Z0-9\-_]+"
pNameRE = r"(?=.{0,400}$)[a-zA-Z0-9\-_.]+"
lfnParts.update( {'publishname' : pNameRE,
'psethash' : '[a-f0-9]+',
'filename' : '[a-zA-Z0-9\-_\.]'}
Expand Down

0 comments on commit ae35b77

Please sign in to comment.