From e7293bb80c7701c11999998a7a1070cbd7a7d960 Mon Sep 17 00:00:00 2001
From: David James <davidjames@google.com>
Date: Wed, 7 Dec 2011 15:15:37 -0800
Subject: [PATCH] Fix sort order for cros_workon info.

cros_workon info currently reports warnings about the sort order being
wrong. This is because we're sorting the results in a different order
from what join expects. We should fix that.

BUG=chromium-os:23909
TEST=Verify warnings are gone.

Change-Id: I021a6ac97f3ebd9d0ce0c6350b8c080e4a42977b
Reviewed-on: https://gerrit.chromium.org/gerrit/12596
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
Commit-Ready: David James <davidjames@chromium.org>
Reviewed-by: Mandeep Singh Baines <msb@chromium.org>
---
 cros_workon | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/cros_workon b/cros_workon
index 6f4ecc2593..4ea9c0cdbf 100755
--- a/cros_workon
+++ b/cros_workon
@@ -142,15 +142,16 @@ show_workon_ebuilds() {
 show_workon_info() {
    local atoms="$1"
    local keyword="$2"
+   local sort="sort -u -k1b,1"
    # Column 1: Package name
    # Column 2: Repo name
    # Column 3: Source directory (if present locally)
    join \
-     <(echo "$atoms" | sed -e 's/ /\n/g' | sort -u) \
+     <(echo "${atoms}" | sed -e 's/ /\n/g' | ${sort}) \
      <(join -a 1 -e - -o 1.2,1.1,2.2 \
-       <(show_project_ebuild_map "${keyword}" | sort -u) \
-       <(show_project_path_map | sort -u) \
-       | sort -u)
+       <(show_project_ebuild_map "${keyword}" | ${sort}) \
+       <(show_project_path_map | ${sort}) \
+       | ${sort})
 }
 
 # Canonicalize package name to category/package.