Fix a couple bugs found when turning on archiving for nplus1 updates from cbuildbot.

1) Change join marker from -- to _ as it's much more human readable.
  -- meaning payloads look like chromeos_R16-1024.0.0-a1_x86-zgb_full_dev.bin
2) Reading from last local build wasn't working correctly as I wasn't passing
  any information about the folder (no name was embedded so no version).  Fixed
  to archive into latest_download/<version>/chromiumos_test_image.bin.  This
  also had the side-benefit of not having to have me repro this each time I test
  a change.
3) New 3-version logic had broken my regexp unnoticed.

TEST=Ran ctest with local copy of what's stored on one of the builders.

Change-Id: Idcfbb8d01ed805200af7df107da4e55286fc2dc5
Tested-by: Chris Sosa <>
Reviewed-by: Dale Curtis <>
2 files changed