summaryrefslogtreecommitdiffstats
path: root/chrome/installer
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-26 21:50:34 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-26 21:50:34 +0000
commit1e25264e77c37f88ba08e8b3e4c9b1f892fab637 (patch)
tree07123df5c14054bcd64da303d13ece8cf67ce918 /chrome/installer
parentf32e2d1e3a57d2d0ec2e731d8cd0ac54f3778bd8 (diff)
downloadchromium_src-1e25264e77c37f88ba08e8b3e4c9b1f892fab637.zip
chromium_src-1e25264e77c37f88ba08e8b3e4c9b1f892fab637.tar.gz
chromium_src-1e25264e77c37f88ba08e8b3e4c9b1f892fab637.tar.bz2
Revert "Linux: clean up old glibc sed call only applicable on Ubuntu Lucid."
> Linux: clean up old glibc sed call only applicable on Ubuntu Lucid. > > BUG=none > R=thestig@chromium.org > > Review URL: https://codereview.chromium.org/20593002 TBR=thestig BUG=none Review URL: https://codereview.chromium.org/20833003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213990 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
-rwxr-xr-xchrome/installer/linux/debian/build.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh
index 1b6298f..d9d98a1 100755
--- a/chrome/installer/linux/debian/build.sh
+++ b/chrome/installer/linux/debian/build.sh
@@ -270,7 +270,9 @@ if [ -n "$SAVE_LDLP" ]; then
fi
# Format it nicely and save it for comparison.
-echo "$DPKG_SHLIB_DEPS" | sed 's/, /\n/g' > actual
+# The grep -v is for a duplicate libc6 dep caused by Lucid glibc silliness.
+echo "$DPKG_SHLIB_DEPS" | sed 's/, /\n/g' | \
+ grep -v '^libc6 (>= 2.3.6-6~)$' > actual
# Compare the expected dependency list to the generate list.
BAD_DIFF=0