Skip to content

Two small fixes for commit script

Spyros Argyropoulos requested to merge smallfix into master

Description of bug

  • Actual call to logParser from commit script is python3 scripts/logParser.py -c -i $dsiddir/$dsid/log.generate -j $joFile while the call when an error is found is misses the -j part. This means that on rare occasions (when the jO file is changed since log.generate is created???) you can actually have something like this:

Screenshot_2020-04-21_at_21.02.16

while if you run with -j you see the error:

Screenshot_2020-04-21_at_21.03.02
Screenshot_2020-04-21_at_21.04.55

Changes introduced

  • Harmonise call to logParser when checking for errors and when printing them out.
  • Also keeping only the first occurence of atlas-physics/pmg/mcjoboptions.git when finding remote branch name, so that cases like this are handled more cleanly (this is not really a bug since picking any of the two remote names would lead to exactly the same behaviour)
origin	https://:@gitlab.cern.ch:8443/atlas-physics/pmg/mcjoboptions.git (fetch)
origin	https://:@gitlab.cern.ch:8443/atlas-physics/pmg/mcjoboptions.git (push)
upstream	https://:@gitlab.cern.ch:8443/atlas-physics/pmg/mcjoboptions.git (fetch)
upstream	https://:@gitlab.cern.ch:8443/atlas-physics/pmg/mcjoboptions.git (push)

Tests

Issues resolved

Closes #

Edited by Spyros Argyropoulos

Merge request reports

Loading