New issue
Advanced search Search tips
Note: Color blocks (like or ) mean that a user may not be available. Tooltip shows the reason.

Issue 747171 link

Starred by 2 users

Issue metadata

Status: WontFix
Owner:
Last visit > 30 days ago
Closed: Jul 2017
Cc:
Components:
EstimatedDays: ----
NextAction: ----
OS: Chrome
Pri: 1
Type: Bug



Sign in to add a comment

Chrome OS bots have conflicting version of grit in their site-packages

Project Member Reported by achuith@chromium.org, Jul 20 2017

Issue description

Compile failure:
//chrome/browser/resources/settings:unpak(//build/toolchain/cros:target)
chromeos-chrome-61.0.3163.0_alpha-r1: FAILED: gen/chrome/browser/resources/settings/settings_resources.unpak 
chromeos-chrome-61.0.3163.0_alpha-r1: python ../../../../../../../home/chrome-bot/chrome_root/src/chrome/browser/resources/unpack_pak.py --out_folder gen/chrome/browser/resources/settings/settings_resources.unpak --pak_file gen/chrome/browser/resources/settings/settings_resources.pak
chromeos-chrome-61.0.3163.0_alpha-r1: Wrong file version in  gen/chrome/browser/resources/settings/settings_resources.pak
chromeos-chrome-61.0.3163.0_alpha-r1: Traceback (most recent call last):
chromeos-chrome-61.0.3163.0_alpha-r1:   File "../../../../../../../home/chrome-bot/chrome_root/src/chrome/browser/resources/unpack_pak.py", line 67, in <module>
chromeos-chrome-61.0.3163.0_alpha-r1:     main()
chromeos-chrome-61.0.3163.0_alpha-r1:   File "../../../../../../../home/chrome-bot/chrome_root/src/chrome/browser/resources/unpack_pak.py", line 63, in main
chromeos-chrome-61.0.3163.0_alpha-r1:     unpack(args.pak_file, args.out_folder)
chromeos-chrome-61.0.3163.0_alpha-r1:   File "../../../../../../../home/chrome-bot/chrome_root/src/chrome/browser/resources/unpack_pak.py", line 24, in unpack
chromeos-chrome-61.0.3163.0_alpha-r1:     data = data_pack.DataPack.ReadDataPack(pak_path)
chromeos-chrome-61.0.3163.0_alpha-r1:   File "/usr/lib64/python2.7/site-packages/grit/format/data_pack.py", line 60, in ReadDataPack
chromeos-chrome-61.0.3163.0_alpha-r1:     raise WrongFileVersion
chromeos-chrome-61.0.3163.0_alpha-r1: grit.format.data_pack.WrongFileVersion

CL causing failure:
https://codereview.chromium.org/2969123002

First failing build:
https://uberchromegw.corp.google.com/i/chromiumos.chromium/builders/amd64-generic-tot-chromium-pfq-informational/builds/12634
 
Reached out to Andrew, revert ready to go: https://codereview.chromium.org/2989443002/
Looks like a bot issue rather than a bug worthy of a revert:

File "/usr/lib64/python2.7/site-packages/grit/format/data_pack.py", line 60, in ReadDataPack

Why is data_pack.py in site-packages? It's overriding the one in the source tree, effectively making any change to data_pack.py impossible.
Components: Infra>Client>ChromeOS
Note: we could work around this quirk by making sure the version of data_pack.py is first in sys.path rather than last:

https://cs.chromium.org/chromium/src/chrome/browser/resources/unpack_pak.py?q=unpack_pak.py&sq=package:chromium&dr&l=17

But I know that many other scripts append to sys.path to import chromium modules, and you run the risk of accidentally overriding a system module if you do this as well.

Adding ChromeOS Infra.
On second though, given that this bot will cause others grief, let's revert for now while infra investigates.
Cc: agrieve@chromium.org
Owner: ----
Status: Available (was: Assigned)
Summary: Chrome OS bots have conflicting version of grit in their site-packages (was: chromeos build_packages failure on unpacking settings_resources)
Updating title to reflect the actual bug.
Status: Untriaged (was: Available)
And marking as untriaged in case that's required to have it looked at.
Cc: davidri...@chromium.org akes...@chromium.org charliemooney@chromium.org jorgelo@chromium.org wuchengli@chromium.org
 Issue 747254  has been merged into this issue.
The breakage has been reverted last night, Ketaki is starting off a new PFQ build.
Cc: -wuchengli@chromium.org
Owner: pho...@chromium.org
Status: Assigned (was: Untriaged)
To clarify, is this a failure due to an extra site-package inside the chroot (in which case, probably put there by some chroot ebuild) or outside the chroot (in which case, in the hands of Chrome infra who manages the bot image) ?
I don't know about chroots on these bots, but the error was about:
/usr/lib64/python2.7/site-packages/grit/format/data_pack.py"

and it happened when running ninja (does building happen within a chroot?).
Status: Started (was: Assigned)
Odd, the path "/usr/lib64/" doesn't exist on the builder which ran the build that failed (
https://uberchromegw.corp.google.com/i/chromiumos.chromium/builders/amd64-generic-tot-chromium-pfq-informational/builds/12634)

This must be within the chroot, I'm guessing?
Yes, confirmed that grit is present in the chroot.
Any pointers to who owns the chroot, or how one would go about changing the chroot?
Cc: vapier@chromium.org llozano@chromium.org
Luis, Mike, any suggestions on who could help with this?
we build+install grit in the chroot sdk because we use grit for translations with other packages.
https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/master/sys-devel/grit-i18n/grit-i18n-20150304.ebuild

should be easy to update grit in the sdk as needed.
Am I correct then, that the way to make a change to grit is:

1. Check in a change
2. Find out that it breaks chromeos bots 
3. Revert change, file a bug
4. Find out that sdk needs updating
5. Reland change, let bots break again
6. Request that bot be fixed by updating sdk to match what's in src

Rather than this flow, would you consider using the version of grit directly from the chromium checkout?

Alternatively, install the chroot version of grit to some other location so that "import grit" doesn't cause it to be imported?

Or use a symlink in /usr/lib64/python2.7/site-packages/grit -> chromium grit
none of those would work.  Chromium CQ changes don't validate against CrOS.

collision between system python packages and local copies is "normal".  if you want to be able to execute programs straight out of the git repo, the programs detect this and inject their local path dynamically to the start of the active python path.  grit isn't unique here.
$ cat pak_util
#!/usr/bin/env python
# Copyright 2017 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

import os
import sys

file = os.path.realpath(__file__)
sys.path.insert(0, os.path.dirname(file))
os.execv(file + '.py', sys.argv)
Alright, I think you're winning me over. There's a *lot* of code in chromium that uses sys.path.append(), but only 3 files that do so for grit (that I can see). 

As an aside, does the sys.path.insert() do anything in your example? I'd guess the script would work the same without it.
the sys.path.insert is the critical part -- it forces the local copy of the grit git repo to the start of the python module search path for the active process

although now that i think about it more, this only works if we import grit and execute main directly.  if we want it to persist across the exec, we'd have to update PYTHONPATH in the environ.
Probably not worth it for this one conflict, but I'd like to point out that using virtualenv avoids these sorts of problems :)
Status: WontFix (was: Started)
CL to use sys.path.insert:
https://chromium-review.googlesource.com/c/589888/

Existing bug for using virtualenv:
https://bugs.chromium.org/p/chromium/issues/detail?id=740320
Project Member

Comment 27 by bugdroid1@chromium.org, Jul 28 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/c3f3d376b7db629c66c8e8422da2b718792f4a0f

commit c3f3d376b7db629c66c8e8422da2b718792f4a0f
Author: Andrew Grieve <agrieve@chromium.org>
Date: Fri Jul 28 16:51:47 2017

Prepend grit to sys.path since chromeos trybots contain a system copy

When the path was appended, the system module on chromeos bots was
taking precendence over the local copy.

BUG= 747171 
TBR=atwilson

Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I3793b6a1b27243ebeb55b0516c16a3a3ba5b2dc9
Reviewed-on: https://chromium-review.googlesource.com/589888
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: Greg Thompson <grt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#490431}
[modify] https://crrev.com/c3f3d376b7db629c66c8e8422da2b718792f4a0f/chrome/browser/resources/unpack_pak.py
[modify] https://crrev.com/c3f3d376b7db629c66c8e8422da2b718792f4a0f/chrome/installer/util/prebuild/create_string_rc.py
[modify] https://crrev.com/c3f3d376b7db629c66c8e8422da2b718792f4a0f/components/policy/tools/grd_helper.py

just to be clear, virtualenv isn't a silver bullet.  it's just replacing one set of shortcomings with a different set (think static-vs-dynamic linking trade-offs).  although it might line up better with the depot_tools model where a lot of things are bundled.
Re #28, since more than one python script can share a virtualenv, you can sort of get the best of both worlds.
Project Member

Comment 30 by bugdroid1@chromium.org, Aug 18 2017

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/9e64cff36bf14da50737f1fc78fa403c2e5a4150

commit 9e64cff36bf14da50737f1fc78fa403c2e5a4150
Author: Mike Frysinger <vapier@chromium.org>
Date: Fri Aug 18 21:27:20 2017

grit-i18n: update to current tree

BUG= chromium:747171 
TEST=precq passes

Change-Id: I879bd8ac21efd3d3904f2eff2f0f038de03bca94
Reviewed-on: https://chromium-review.googlesource.com/588140
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>

[rename] https://crrev.com/9e64cff36bf14da50737f1fc78fa403c2e5a4150/sys-devel/grit-i18n/grit-i18n-20170720.ebuild
[modify] https://crrev.com/9e64cff36bf14da50737f1fc78fa403c2e5a4150/sys-devel/grit-i18n/Manifest

Note that the commit in comment 30 has been reverted due to 757792.
Project Member

Comment 32 by bugdroid1@chromium.org, Nov 6

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/b776598fdd60135df9429c85ba53e3b61b605ace

commit b776598fdd60135df9429c85ba53e3b61b605ace
Author: Mike Frysinger <vapier@chromium.org>
Date: Tue Nov 06 07:13:44 2018

grit: drop python version checks

Checking the python version on the fly doesn't add any value, so drop it.

Bug:  747171 
Change-Id: Ieb1a6287c365aedd25c17edba1dd06cc14505e07
Reviewed-on: https://chromium-review.googlesource.com/c/1319169
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605620}
[modify] https://crrev.com/b776598fdd60135df9429c85ba53e3b61b605ace/tools/grit/grit/grit_runner.py
[modify] https://crrev.com/b776598fdd60135df9429c85ba53e3b61b605ace/tools/grit/grit_info.py

Project Member

Comment 33 by bugdroid1@chromium.org, Nov 6

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/71b73f9ae4175ff7ec922eca65621ebd7bbaefda

commit 71b73f9ae4175ff7ec922eca65621ebd7bbaefda
Author: Mike Frysinger <vapier@chromium.org>
Date: Tue Nov 06 16:48:23 2018

grit: drop +x perms on non-scripts

None of these Python modules are executable (lack main funcs),
so it doesn't make sense to have +x perms on them.

Bug:  747171 
Change-Id: I393d7210f4885dc3db506d94ce50ac736e3fe22e
Reviewed-on: https://chromium-review.googlesource.com/c/1319170
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Robert Flack <flackr@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605713}
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/__init__.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/clique.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/constants.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/exception.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/extern/BogoFP.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/extern/FP.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/extern/tclib.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/format/__init__.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/format/android_xml.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/format/c_format.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/format/js_map_format.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/format/policy_templates_json.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/format/rc.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/format/rc_header.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/format/resource_map.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/gather/__init__.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/gather/admin_template.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/gather/chrome_html.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/gather/chrome_scaled_image.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/gather/interface.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/gather/json_loader.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/gather/policy_json.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/gather/rc.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/gather/regexp.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/gather/skeleton_gatherer.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/gather/tr_html.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/gather/txt.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/lazy_re.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/node/__init__.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/node/base.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/node/custom/__init__.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/node/custom/filename.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/node/empty.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/node/include.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/node/io.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/node/mapping.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/node/message.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/node/misc.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/node/structure.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/node/variant.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/pseudo.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/pseudo_rtl.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/scons.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/shortcuts.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/tclib.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/tool/__init__.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/tool/android2grd.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/tool/build.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/tool/buildinfo.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/tool/count.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/tool/diff_structures.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/tool/interface.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/tool/menu_from_parts.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/tool/newgrd.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/tool/postprocess_interface.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/tool/preprocess_interface.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/tool/rc2grd.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/tool/resize.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/tool/test.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/tool/transl2tc.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/tool/unit.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/tool/xmb.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/util.py
[modify] https://crrev.com/71b73f9ae4175ff7ec922eca65621ebd7bbaefda/tools/grit/grit/xtb_reader.py

Project Member

Comment 34 by bugdroid1@chromium.org, Nov 6

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/59a2577cc4cf6eff9d903e504da722c7ce92df16

commit 59a2577cc4cf6eff9d903e504da722c7ce92df16
Author: Mike Frysinger <vapier@chromium.org>
Date: Tue Nov 06 19:53:07 2018

grit: handle invalid command line options better

Currently when passing unknown options, we get a traceback:
Traceback (most recent call last):
  File "/usr/lib/python-exec/python2.7/grit", line 15, in <module>
    grit.grit_runner.Main(sys.argv[1:])
  File "/usr/lib64/python2.7/site-packages/grit/grit_runner.py", line 229, in Main
    args = options.ReadOptions(args)  # args may be shorter after this
  File "/usr/lib64/python2.7/site-packages/grit/grit_runner.py", line 167, in ReadOptions
    (opts, args) = getopt.getopt(args, 'g:qdvxc:i:p:h:', ('psyco',))
  File "/usr/lib64/python2.7/getopt.py", line 90, in getopt
    opts, args = do_shorts(opts, args[0][1:], shortopts, args[1:])
  File "/usr/lib64/python2.7/getopt.py", line 190, in do_shorts
    if short_has_arg(opt, shortopts):
  File "/usr/lib64/python2.7/getopt.py", line 206, in short_has_arg
    raise GetoptError('option -%s not recognized' % opt, opt)
getopt.GetoptError: option -a not recognized

This is a lot of noise except for the final line.  This can be even
harder when grit doesn't have standard -h (help) options.  Issue a
normal error message so it's clear to users what's wrong.

Bug:  747171 
Change-Id: If3989f54e16e7952d872f5f19a97a0cbd2c1f4c7
Reviewed-on: https://chromium-review.googlesource.com/c/1319171
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605793}
[modify] https://crrev.com/59a2577cc4cf6eff9d903e504da722c7ce92df16/tools/grit/grit/grit_runner.py

Project Member

Comment 35 by bugdroid1@chromium.org, Nov 6

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/2440c5a9155a9a78e8af1f4c38046d5f28526385

commit 2440c5a9155a9a78e8af1f4c38046d5f28526385
Author: Mike Frysinger <vapier@chromium.org>
Date: Tue Nov 06 22:31:58 2018

grit: delay "help" builtin parsing

The "help" ad-hoc parsing only works in the simplest case:
  grit help
  grit help foo

When passing options to grit, the "help" builtin fails and producing
confusing output:
  $ grit -i ... help
  No such tool.  Try running 'grit help' for a list of tools.
  $ grit -i ... help xmb
  No such tool.  Try running 'grit help' for a list of tools.

Delay parsing of the "help" tool until after we've processed grit's
core options.

Bug:  747171 
Change-Id: Iae5fdee2493346cee4272368ac8862647433faaf
Reviewed-on: https://chromium-review.googlesource.com/c/1320690
Reviewed-by: agrieve <agrieve@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605854}
[modify] https://crrev.com/2440c5a9155a9a78e8af1f4c38046d5f28526385/tools/grit/grit/grit_runner.py

Project Member

Comment 36 by bugdroid1@chromium.org, Nov 8

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/e2114eda56337b3fcef99fe2ac5af311606864d0

commit e2114eda56337b3fcef99fe2ac5af311606864d0
Author: Mike Frysinger <vapier@chromium.org>
Date: Thu Nov 08 08:48:13 2018

grit-i18n: update to current tree [reland]

We've updated the recovery code to handle fallback English messages
itself now, so the new grit behavior that broke before shouldn't be
a problem.

BUG= chromium:747171 
TEST=precq passes
CQ-DEPEND=CL:1319409

Change-Id: I8d7c52b854f9e186143054af05d4d6bb73f74459
Reviewed-on: https://chromium-review.googlesource.com/1319429
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Chirantan Ekbote <chirantan@chromium.org>

[rename] https://crrev.com/e2114eda56337b3fcef99fe2ac5af311606864d0/sys-devel/grit-i18n/grit-i18n-20170720.ebuild
[modify] https://crrev.com/e2114eda56337b3fcef99fe2ac5af311606864d0/sys-devel/grit-i18n/Manifest

Project Member

Comment 37 by bugdroid1@chromium.org, Nov 8

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/4c212d9a18134fd10ec28dba91a71497ed42765a

commit 4c212d9a18134fd10ec28dba91a71497ed42765a
Author: Mike Frysinger <vapier@chromium.org>
Date: Thu Nov 08 20:14:35 2018

grit: fix buildinfo help output

The usage docs were in the wrong docstring.

Bug:  747171 
Change-Id: Ia08331f8c41f86ce41c795ff1494e258c0d33bf3
Reviewed-on: https://chromium-review.googlesource.com/c/1323807
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606582}
[modify] https://crrev.com/4c212d9a18134fd10ec28dba91a71497ed42765a/tools/grit/grit/tool/buildinfo.py

Project Member

Comment 38 by bugdroid1@chromium.org, Nov 15

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/fa9ef46bad0a7bc19c75f8fc25029cdb8b085e3f

commit fa9ef46bad0a7bc19c75f8fc25029cdb8b085e3f
Author: Mike Frysinger <vapier@chromium.org>
Date: Thu Nov 15 00:37:37 2018

grit: add support for standard --help flag

Trying to use --help with grit just ends in errors like:
  $ grit --help
  getopt.GetoptError: option --help not recognized

Add support for it with `grit --help`.  This doesn't update the
subtools for now as that'll take much more work/thought.

We also don't support the -h short option as it's already used for
other things, and we don't want to complicate/break it.

Bug:  747171 
Change-Id: Ied24f810ed583d464dc2970c8e472784e22ec044
Reviewed-on: https://chromium-review.googlesource.com/c/1327421
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608196}
[modify] https://crrev.com/fa9ef46bad0a7bc19c75f8fc25029cdb8b085e3f/tools/grit/grit/grit_runner.py

Project Member

Comment 39 by bugdroid1@chromium.org, Nov 16

The following revision refers to this bug:
  https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay/+/21bcf8adfea8493a6296b2e3c6116f8c74951835

commit 21bcf8adfea8493a6296b2e3c6116f8c74951835
Author: Mike Frysinger <vapier@chromium.org>
Date: Fri Nov 16 07:54:33 2018

grit-i18n: version bump to the latest

BUG= chromium:747171 
TEST=precq passes
TEST=ran `make_images` in recovery and compared generated screens

Change-Id: Ie14f0530e1f735a0fa322e19d728c9f725af5840
Reviewed-on: https://chromium-review.googlesource.com/1328681
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Chirantan Ekbote <chirantan@chromium.org>

[rename] https://crrev.com/21bcf8adfea8493a6296b2e3c6116f8c74951835/sys-devel/grit-i18n/grit-i18n-20181108.ebuild
[modify] https://crrev.com/21bcf8adfea8493a6296b2e3c6116f8c74951835/sys-devel/grit-i18n/Manifest

Project Member

Comment 40 by bugdroid1@chromium.org, Nov 22

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/f30db062e60e59803b49de2db4f0c792756ef1ff

commit f30db062e60e59803b49de2db4f0c792756ef1ff
Author: Mike Frysinger <vapier@chromium.org>
Date: Thu Nov 22 06:29:10 2018

grit: add --help support to subtools

This makes `grit build --help` work too.

Bug:  747171 
Change-Id: I5297019a34446196e625635318f2373620ffd87f
Reviewed-on: https://chromium-review.googlesource.com/c/1339341
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610320}
[modify] https://crrev.com/f30db062e60e59803b49de2db4f0c792756ef1ff/tools/grit/grit/grit_runner.py
[modify] https://crrev.com/f30db062e60e59803b49de2db4f0c792756ef1ff/tools/grit/grit/tool/android2grd.py
[modify] https://crrev.com/f30db062e60e59803b49de2db4f0c792756ef1ff/tools/grit/grit/tool/build.py
[modify] https://crrev.com/f30db062e60e59803b49de2db4f0c792756ef1ff/tools/grit/grit/tool/buildinfo.py
[modify] https://crrev.com/f30db062e60e59803b49de2db4f0c792756ef1ff/tools/grit/grit/tool/count.py
[modify] https://crrev.com/f30db062e60e59803b49de2db4f0c792756ef1ff/tools/grit/grit/tool/diff_structures.py
[modify] https://crrev.com/f30db062e60e59803b49de2db4f0c792756ef1ff/tools/grit/grit/tool/interface.py
[modify] https://crrev.com/f30db062e60e59803b49de2db4f0c792756ef1ff/tools/grit/grit/tool/newgrd.py
[modify] https://crrev.com/f30db062e60e59803b49de2db4f0c792756ef1ff/tools/grit/grit/tool/rc2grd.py
[modify] https://crrev.com/f30db062e60e59803b49de2db4f0c792756ef1ff/tools/grit/grit/tool/resize.py
[modify] https://crrev.com/f30db062e60e59803b49de2db4f0c792756ef1ff/tools/grit/grit/tool/transl2tc.py
[modify] https://crrev.com/f30db062e60e59803b49de2db4f0c792756ef1ff/tools/grit/grit/tool/unit.py
[modify] https://crrev.com/f30db062e60e59803b49de2db4f0c792756ef1ff/tools/grit/grit/tool/xmb.py

Sign in to add a comment