cros_workon: collapse cros_workon_common.sh

cros_workon: collapse cros_workon_common.sh

cros_workon is the only user of cros_workon_common.sh

This is pre-requisite to moving cros_workon into devutils.git

BUG=11507
TEST=Ran ./cros_workon --board x86-generic --all list

Change-Id: I1eab551ab33646360e507328932c151a0d36f50a

Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=f9ea003

[zbehan, 2011-01-31 23:53:04]

LGTM

This has been originally used by sosa for part of the PFQ bot, I believe.
The bot now works differently and does not include the common part.

On Tue, Feb 1, 2011 at 12:44 AM, <msb@chromium.org> wrote:

> Reviewers: robotboy, zbehan,
>
> Description:
> cros_workon: collapse cros_workon_common.sh
>
> cros_workon is the only user of cros_workon_common.sh
>
> This is pre-requisite to moving cros_workon into devutils.git
>
> BUG=11507
> TEST=Ran ./cros_workon --board x86-generic --all list
>
> Change-Id: I1eab551ab33646360e507328932c151a0d36f50a
>
> Please review this at http://codereview.chromium.org/6347052/
>
> SVN Base: http://git.chromium.org/git/crosutils.git@master
>
> Affected files:
>  M cros_workon
>  D lib/cros_workon_common.sh
>
>
> Index: cros_workon
> diff --git a/cros_workon b/cros_workon
> index
>
61b1e4742005afd381d3bb22b60dd61a60d4a020..0c7ded12ad3995f45c00df04a468ac49efb2e2e2
> 100755
> --- a/cros_workon
> +++ b/cros_workon
> @@ -14,9 +14,6 @@
>  # The path to common.sh should be relative to your script's location.
>  . "$(dirname "$0")/common.sh"
>
> -# Load common functions for workon scripts.
> -. "$(dirname "$0")/lib/cros_workon_common.sh"
> -
>  # Script must be run inside the chroot
>  restart_in_chroot_if_needed $*
>  get_default_board
> @@ -98,6 +95,32 @@ if [ ! -L "${UNMASK_FILE}" ]; then
>     die "ln -s ${WORKON_FILE} ${UNMASK_FILE}"
>  fi
>
> +find_keyword_workon_ebuilds() {
> +  keyword="${1}"
> +
> +  pushd "${BOARD_DIR}"/etc/ 1> /dev/null
> +  source make.conf
> +  popd 1> /dev/null
> +  local CROS_OVERLAYS="${PORTDIR_OVERLAY}"
> +
> +  # NOTE: overlay may be a symlink, and we have to use ${overlay}/
> +  for overlay in ${CROS_OVERLAYS}; do
> +    # only look up ebuilds named 9999 to eliminate duplicates
> +    find ${overlay}/ -name '*9999.ebuild' | \
> +      xargs grep -l "inherit.*cros-workon" | \
> +      xargs grep -l "KEYWORDS=.*${keyword}.*"
> +  done
> +}
> +
> +show_workon_ebuilds() {
> +  keyword=$1
> +
> +  find_keyword_workon_ebuilds ${keyword} | \
> +    sed -e 's/.*\/\([^/]*\)\/\([^/]*\)\/.*\.ebuild/\1\/\2/' | \
> +       sort -u
> +  # This changes the absolute path to ebuilds into category/package.
> +}
> +
>  # Canonicalize package name to category/package.
>  canonicalize_name () {
>   local pkgfile
> Index: lib/cros_workon_common.sh
> diff --git a/lib/cros_workon_common.sh b/lib/cros_workon_common.sh
> deleted file mode 100644
> index
>
b7f1a12bee20ce46c8865748284b2c710aca9ed3..0000000000000000000000000000000000000000
> --- a/lib/cros_workon_common.sh
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -#!/bin/bash
> -
> -# Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
> -# Use of this source code is governed by a BSD-style license that can be
> -# found in the LICENSE file.
> -
> -# Common library for functions used by workon tools.
> -
> -find_keyword_workon_ebuilds() {
> -  keyword="${1}"
> -
> -  pushd "${BOARD_DIR}"/etc/ 1> /dev/null
> -  source make.conf
> -  popd 1> /dev/null
> -  local CROS_OVERLAYS="${PORTDIR_OVERLAY}"
> -
> -  # NOTE: overlay may be a symlink, and we have to use ${overlay}/
> -  for overlay in ${CROS_OVERLAYS}; do
> -    # only look up ebuilds named 9999 to eliminate duplicates
> -    find ${overlay}/ -name '*9999.ebuild' | \
> -      xargs grep -l "inherit.*cros-workon" | \
> -      xargs grep -l "KEYWORDS=.*${keyword}.*"
> -  done
> -}
> -
> -show_workon_ebuilds() {
> -  keyword=$1
> -
> -  find_keyword_workon_ebuilds ${keyword} | \
> -    sed -e 's/.*\/\([^/]*\)\/\([^/]*\)\/.*\.ebuild/\1\/\2/' | \
> -       sort -u
> -  # This changes the absolute path to ebuilds into category/package.
> -}
>
>
>

[robotboy, 2011-01-31 23:53:39]

LGTM

[jrbarnette, 2011-02-01 00:00:00]

Mandeep:

When you ran the test with '--all list', did you try this variation of
the command:
    ./cros_workon --board x86-generic --all list >/dev/null

If not, are you aware of this bug:
    http://code.google.com/p/chromium-os/issues/detail?id=11473

I'm guessing your change doesn't affect that bug...

Also, for the BUG=, I think it should be 'BUG=chromium-os:11507';
clicking on the current link gets a bug description for an unrelated
issue.

[zbehan, 2011-02-01 00:06:02]

I believe this is entirely normal. If you want to silence all (stdout and
stderr), you should use &> /dev/null. Since the error message described
obviously comes from a file operation, printing the error on stderr seems
correct behaviour.

Another issue, of course, is, why is it even printing an error about missing
config file. Seems like your build directory is halfway between setup and
not setup.

On Tue, Feb 1, 2011 at 1:00 AM, <jrbarnette@chromium.org> wrote:

> Mandeep:
>
> When you ran the test with '--all list', did you try this variation of
> the command:
>    ./cros_workon --board x86-generic --all list >/dev/null
>
> If not, are you aware of this bug:
>    http://code.google.com/p/chromium-os/issues/detail?id=11473
>
> I'm guessing your change doesn't affect that bug...
>
> Also, for the BUG=, I think it should be 'BUG=chromium-os:11507';
> clicking on the current link gets a bug description for an unrelated
> issue.
>
>
>
> http://codereview.chromium.org/6347052/
>