Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1287)

Unified Diff: cros_workon

Issue 3468009: cros_workon: only touch local_manifest for minilayout users (Closed) Base URL: http://git.chromium.org/git/crosutils.git
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cros_workon
diff --git a/cros_workon b/cros_workon
index d71879f9304f46590695a8acfa78ea5205420dca..6892e7a669e36ef947b4558009ac78f9da324fb1 100755
--- a/cros_workon
+++ b/cros_workon
@@ -136,23 +136,14 @@ show_live_ebuilds () {
sed -n 's/^[~=]\(.*\)-9999$/\1/p' "${WORKON_FILE}"
}
-find_repo_dir () {
- curdir=`pwd`
- while [ $curdir != / ]; do
- if [ -d "$curdir/.repo" ]; then
- #echo "Found .repo directory at ${curdir}"
- REPODIR=${curdir}/.repo
- return 0
- fi
- curdir=`dirname "$curdir"`
- done
- echo "Unable to find .repo directory. Did you checkout with repo?"
- exit 1
-}
-
-
# This is called only for "cros-workon start". We dont handle the "stop" case since the local changes are ignored anyway since the 9999.ebuild is masked and we dont want to deal with what to do with the user's local changes.
regen_manifest_and_sync() {
+ # Nothing to do unless you are working on the minilayout
+ local manifest=${CHROOT_TRUNK_DIR}/.repo/manifest.xml
+ if [ $(basename $(readlink -f ${manifest})) != "minilayout.xml" ]; then
+ return
+ fi
+
for pkgname in $(show_live_ebuilds); do
eval $(${EBUILDCMD} $(${EQUERYCMD} which ${pkgname}) info)
local srcdir=$(readlink -m ${CROS_WORKON_SRCDIR})
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698