diff options
| author | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 23:48:59 +0000 |
|---|---|---|
| committer | mmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 23:48:59 +0000 |
| commit | 07fdd98e4a7cb1b26d74138c3efc3fc55aa765b2 (patch) | |
| tree | 703ab77e14dd23be552e9e769438030429cbf149 /chrome/installer | |
| parent | 16ee695911e2e911d6d5f33092e6748a9c907f39 (diff) | |
| download | chromium_src-07fdd98e4a7cb1b26d74138c3efc3fc55aa765b2.zip chromium_src-07fdd98e4a7cb1b26d74138c3efc3fc55aa765b2.tar.gz chromium_src-07fdd98e4a7cb1b26d74138c3efc3fc55aa765b2.tar.bz2 | |
Make it so the default Linux packages don't configure a repository.
This is nicer for external users who just want to generate a package to
install, or who want to install the packages built on the public buildbot,
which previously weren't configured with a publicly-accessible repository.
Repository-configured packages will be reimplemented in a separate CL.
Review URL: http://codereview.chromium.org/100279
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15123 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/linux/common/apt.include | 8 | ||||
| -rw-r--r-- | chrome/installer/linux/common/chromium-browser/chromium-browser.info | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/chrome/installer/linux/common/apt.include b/chrome/installer/linux/common/apt.include index d0c0ba1..c58737c 100644 --- a/chrome/installer/linux/common/apt.include +++ b/chrome/installer/linux/common/apt.include @@ -68,6 +68,10 @@ find_apt_sources() { # 1 - sources were updated # 2 - error update_sources_lists() { + if [ ! "$REPOCONFIG" ]; then + return 0 + fi + find_apt_sources if [ -d "$APT_SOURCESDIR" ]; then @@ -108,6 +112,10 @@ update_sources_lists() { # 0 - successfully removed, or not configured # 1 - failed to remove clean_sources_lists() { + if [ ! "$REPOCONFIG" ]; then + return 0 + fi + find_apt_sources if [ -d "$APT_SOURCESDIR" ]; then diff --git a/chrome/installer/linux/common/chromium-browser/chromium-browser.info b/chrome/installer/linux/common/chromium-browser/chromium-browser.info index 6439951..4697be1 100644 --- a/chrome/installer/linux/common/chromium-browser/chromium-browser.info +++ b/chrome/installer/linux/common/chromium-browser/chromium-browser.info @@ -27,6 +27,3 @@ FULLDESC="Chromium is a browser that combines a minimal design with sophisticate # TODO(mmoss) Setup a mailbox for this address MAINTNAME="Chromium Linux Team" MAINTMAIL="chromium-linux-packager@chromium.org" - -# TODO(mmoss) This is the dogfooding config. Need to update for release. -REPOCONFIG="deb http://dl.google.com/linux/deb.GOOGLER/ testing main" |