Advertisement
Guest User

Untitled

a guest
Aug 29th, 2014
238
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.93 KB | None | 0 0
  1. Fix Mason report generator Now that we use the upstream trove, rather than local trove for git, the report generator needs to be updated to reflect that. Also mason.sh creates the workspace directory in /, rather than /root/.
  2.  
  3. diff --git a/mason/mason-report.sh b/mason/mason-report.sh
  4. index c18e68a..60fc5a0 100755
  5. --- a/mason/mason-report.sh
  6. +++ b/mason/mason-report.sh
  7. @@ -233,10 +233,10 @@ if [ "$RESULT" = skip ]; then
  8. fi
  9.  
  10. DURATION=$(( $(date +%s) - $(date --date="$START_TIME" +%s) ))
  11. -SHA1="$(cd "ws/$DEFINITIONS_REF/$DISTBUILD_TROVE_ADDRESS/baserock/baserock/definitions" && git rev-parse HEAD)"
  12. +SHA1="$(cd "/ws/$DEFINITIONS_REF/$UPSTREAM_TROVE_ADDRESS/baserock/baserock/definitions" && git rev-parse HEAD)"
  13.  
  14. update_report "$START_TIME" \
  15. - "$DISTBUILD_TROVE_ADDRESS" \
  16. + "$UPSTREAM_TROVE_ADDRESS" \
  17. "$DEFINITIONS_REF" \
  18. "$SHA1" \
  19. "$DURATION" \
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement