Give precedence to trusty-updates in trusty sysroot

Give precedence to trusty-updates in trusty sysroot

Pull package lists from both trusty and trusty-updates, and give
precedence to the packages in trusty-updates when deciding which
packages to add to the sysroot.

BUG=638394
Committed: https://crrev.com/22d47117c3c32d50f233ba6c92dc8c76c275634f
Cr-Commit-Position: refs/heads/master@{#414233}

[Tom (Use chromium acct), 2016-08-23 23:30:23]

The CQ bit was checked by thomasanderson@google.com to run a CQ dry run

[Tom (Use chromium acct), 2016-08-23 23:30:35]

thomasanderson@google.com changed reviewers:
+ thestig@chromium.org

[commit-bot: I haz the power, 2016-08-23 23:31:13]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-24 00:19:01]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-08-24 00:19:02]

Dry run: This issue passed the CQ dry run.

[Tom (Use chromium acct), 2016-08-24 17:13:20]

thomasanderson@google.com changed reviewers:
+ dpranke@chromium.org

[Tom (Use chromium acct), 2016-08-24 17:13:20]

+dpranke

[Dirk Pranke, 2016-08-24 18:31:35]

lgtm

[Lei Zhang, 2016-08-24 18:37:02]

lgtm

https://codereview.chromium.org/2270253002/diff/1/build/linux/sysroot_scripts...
File build/linux/sysroot_scripts/merge-package-lists.py (right):

https://codereview.chromium.org/2270253002/diff/1/build/linux/sysroot_scripts...
build/linux/sysroot_scripts/merge-package-lists.py:2: # Copyright (c) 2016 The
Chromium Authors. All rights reserved.
no (c)

https://codereview.chromium.org/2270253002/diff/1/build/linux/sysroot_scripts...
build/linux/sysroot_scripts/merge-package-lists.py:5: 
Can you add some comments to explain what this does?

https://codereview.chromium.org/2270253002/diff/1/build/linux/sysroot_scripts...
build/linux/sysroot_scripts/merge-package-lists.py:18: for i in range(0,
len(lines), 3):
xrange?

https://codereview.chromium.org/2270253002/diff/1/build/linux/sysroot_scripts...
File build/linux/sysroot_scripts/sysroot-creator.sh (right):

https://codereview.chromium.org/2270253002/diff/1/build/linux/sysroot_scripts...
build/linux/sysroot_scripts/sysroot-creator.sh:215: cat "${TMP_PACKAGE_LIST}" |
python merge-package-lists.py "${list_base}"
Is merge-package-lists.py getting checked in with the executable bit set? omit
"python" ?

[Tom (Use chromium acct), 2016-08-24 22:45:10]

The CQ bit was checked by thomasanderson@google.com

[Tom (Use chromium acct), 2016-08-24 22:45:10]

The patchset sent to the CQ was uploaded after l-g-t-m from
thestig@chromium.org, dpranke@chromium.org
Link to the patchset: https://codereview.chromium.org/2270253002/#ps20001
(title: "Refactor")

[Tom (Use chromium acct), 2016-08-24 22:45:21]

https://codereview.chromium.org/2270253002/diff/1/build/linux/sysroot_scripts...
File build/linux/sysroot_scripts/merge-package-lists.py (right):

https://codereview.chromium.org/2270253002/diff/1/build/linux/sysroot_scripts...
build/linux/sysroot_scripts/merge-package-lists.py:2: # Copyright (c) 2016 The
Chromium Authors. All rights reserved.
On 2016/08/24 18:37:02, Lei Zhang wrote:
> no (c)

Done.

https://codereview.chromium.org/2270253002/diff/1/build/linux/sysroot_scripts...
build/linux/sysroot_scripts/merge-package-lists.py:5: 
On 2016/08/24 18:37:02, Lei Zhang wrote:
> Can you add some comments to explain what this does?

Done.

https://codereview.chromium.org/2270253002/diff/1/build/linux/sysroot_scripts...
build/linux/sysroot_scripts/merge-package-lists.py:18: for i in range(0,
len(lines), 3):
On 2016/08/24 18:37:02, Lei Zhang wrote:
> xrange?

Done.

https://codereview.chromium.org/2270253002/diff/1/build/linux/sysroot_scripts...
File build/linux/sysroot_scripts/sysroot-creator.sh (right):

https://codereview.chromium.org/2270253002/diff/1/build/linux/sysroot_scripts...
build/linux/sysroot_scripts/sysroot-creator.sh:215: cat "${TMP_PACKAGE_LIST}" |
python merge-package-lists.py "${list_base}"
On 2016/08/24 18:37:02, Lei Zhang wrote:
> Is merge-package-lists.py getting checked in with the executable bit set? omit
> "python" ?

Yes it has the executable bit set.  Done.

[commit-bot: I haz the power, 2016-08-24 22:45:44]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-25 00:55:06]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2016-08-25 00:58:57]

Description was changed from

==========
Give precedence to trusty-updates in trusty sysroot

Pull package lists from both trusty and trusty-updates, and give
precedence to the packages in trusty-updates when deciding which
packages to add to the sysroot.

BUG=638394
==========

to

==========
Give precedence to trusty-updates in trusty sysroot

Pull package lists from both trusty and trusty-updates, and give
precedence to the packages in trusty-updates when deciding which
packages to add to the sysroot.

BUG=638394

Committed: https://crrev.com/22d47117c3c32d50f233ba6c92dc8c76c275634f
Cr-Commit-Position: refs/heads/master@{#414233}
==========

[commit-bot: I haz the power, 2016-08-25 00:58:58]

Patchset 2 (id:??) landed as
https://crrev.com/22d47117c3c32d50f233ba6c92dc8c76c275634f
Cr-Commit-Position: refs/heads/master@{#414233}