roll-dep-svn double-writes revision if a dep appears twice in deps_os |
|||
Issue description
In the libyuv DEPS file, we have
vars = {
...
'lss_revision': 'e6527b0cd469e3ff5764785dadcb39bf7d787154',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling catapult
# and whatever else without interference from each other.
'catapult_revision': 'aa736cc76ee5e35215abcfb83a8c354f12d0c684',
}
...
deps_os = {
'android': {
...
'src/third_party/lss':
Var('chromium_git') + '/linux-syscall-support.git' + '@' + Var('lss_revision'),
...
},
'unix': {
'src/third_party/lss':
Var('chromium_git') + '/linux-syscall-support.git' + '@' + Var('lss_revision'),
},
...
}
Running roll-dep-svn --no-verify-revision src/third_party/lss e6527b0cd469e3ff5764785dadcb39bf7d787154
produces the following change:
'lss_revision':
'e6527b0cd469e3ff5764785dadcb39bf7d787154'e6527b0cd469e3ff5764785dadcb39bf7d787154785dadcb39bf7d787154',
which is obviously incorrect, it should be just 'e6527b0cd469e3ff5764785dadcb39bf7d787154'.
,
Jan 2 2018
,
Jan 2 2018
A better fix here would be to update the libyuv DEPS file to use conditions rather than deps_os. I though phajdan.jr fixed all DEPS files when he did that conversion, but apparently not libyuv's.
,
Jan 3 2018
,
Jan 3 2018
The following revision refers to this bug: https://chromium.googlesource.com/libyuv/libyuv.git/+/911bfaecddebb9b28a7044a38a6a501320bb351e commit 911bfaecddebb9b28a7044a38a6a501320bb351e Author: Patrik Höglund <phoglund@chromium.org> Date: Wed Jan 03 19:49:44 2018 Move DEPS to conditions. All other DEPS-using projects have migrated away from deps_os, so let us do the same. This also fixes the roll-svn-dep bug. Bug: chromium:798336 , libyuv:768 Change-Id: I1528720766af9a0f0d4906aa0ad440408232f6d0 Reviewed-on: https://chromium-review.googlesource.com/848812 Commit-Queue: Frank Barchard <fbarchard@chromium.org> Reviewed-by: Aaron Gable <agable@chromium.org> Reviewed-by: Frank Barchard <fbarchard@chromium.org> [modify] https://crrev.com/911bfaecddebb9b28a7044a38a6a501320bb351e/DEPS
,
Jan 4 2018
|
|||
►
Sign in to add a comment |
|||
Comment 1 by phoglund@chromium.org
, Jan 2 2018