Simplify logic around download package.provided file now that it is a directory
Now that package.provided is a directory, no need to >> things together.
BUG=chromium:182299
TEST=Ran it with fix.
CQ-DEPEND=If95eddc2f687d5ccc983d964d5fba7b0e4631c02
Change-Id: Ife3d5ac2a3c598c31441f2fe6f88b07a1842498a
Reviewed-on: https://gerrit.chromium.org/gerrit/45169
Tested-by: Chris Sosa <sosa@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Chris Sosa <sosa@chromium.org>
diff --git a/dev-install/dev_install b/dev-install/dev_install
index acb697c..2733c91 100755
--- a/dev-install/dev_install
+++ b/dev-install/dev_install
@@ -157,17 +157,9 @@
local package_provided="${BINHOST}/package.provided"
local tmp_provided="$(mktemp)"
if ! curl --fail -o "${tmp_provided}" "${package_provided}"; then
- cat "${P_CONFIG_CROS}/make.profile/package.provided" "${tmp_provided}" > \
- "${P_CONFIG_DEVELOPER}/make.profile/package.provided"
- else
- error "Could not find package.provided. If you get errors" \
- "finding dependencies during emerge, modify" \
- "${P_CONFIG_DEVELOPER}/make.profile/package.provided and re-run" \
- "emerge."
- cp "${P_CONFIG_CROS}/make.profile/package.provided" \
- "${P_CONFIG_DEVELOPER}/make.profile/package.provided"
+ mv "${tmp_provided}" \
+ "${P_CONFIG_DEVELOPER}/make.profile/package.provided/gsutil_provided"
fi
- rm "${tmp_provided}"
}
install_optional_packages() {