diff --git a/chroot_version_hooks.d/25_suppress_incremental_build_across_chroot b/chroot_version_hooks.d/25_suppress_incremental_build_across_chroot index b2e1484afc..ecba4865d9 100644 --- a/chroot_version_hooks.d/25_suppress_incremental_build_across_chroot +++ b/chroot_version_hooks.d/25_suppress_incremental_build_across_chroot @@ -10,13 +10,15 @@ # pulls the content out to the new location within the chroot. upgrade_path() { - local src="/var/cache/distfiles/target/$1" - local dest="/var/cache/chromeos-chrome/$1" + local src="/var/cache/distfiles/target/$2" + local dest="/var/cache/chromeos-chrome/$2" + info "[$1/4] Checking $src vs $dest" if [ -d "$src" ]; then if [ -d "$dest" ]; then # User has already built it- thus wipe the src and use what's in # the chrome specific cache. + info "[$1/4] Cleaning $src; this could take a while" sudo rm -rf "$src" else sudo mv "$src" "$dest" @@ -27,9 +29,9 @@ upgrade_path() { sudo mkdir -p 0775 /var/cache/chromeos-chrome/ sudo chown "$USER:portage" /var/cache/chromeos-chrome/ -upgrade_path chrome-src -upgrade_path chrome-src-internal -upgrade_path chrome-src-custom -upgrade_path chrome-src-custom-internal +upgrade_path 1 chrome-src +upgrade_path 2 chrome-src-internal +upgrade_path 3 chrome-src-custom +upgrade_path 4 chrome-src-custom-internal exit 0