Retry N-1 times with the --jobs flag, then drop it

src/scripts/common.sh

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Common constants for build scripts
 # This must evaluate properly for both /bin/bash and /bin/sh
 
 # All scripts should die on error unless commands are specifically excepted
 # by prefixing with '!' or surrounded by 'set +e' / 'set -e'.
 # TODO: Re-enable this once shflags is less prone to dying.
@@ skipping 288 matching lines @@
 }
 
 function die {
   error "$1"
   exit 1
 }
 
 # Retry an emerge command according to $FLAGS_retries
 # The $EMERGE_JOBS flags will only be added the first time the command is run
 function eretry () {
-  $* $EMERGE_JOBS && return 0
   local i=
   for i in $(seq $FLAGS_retries); do
     echo Retrying $*
-    $* && return 0
+    $* $EMERGE_JOBS && return 0
   done
+  $* && return 0
   return 1
 }
 
 # Removes single quotes around parameter
 # Arguments:
 #   $1 - string which optionally has surrounding quotes
 # Returns:
 #   None, but prints the string without quotes.
 function remove_quotes() {
   echo "$1" | sed -e "s/^'//; s/'$//"
@@ skipping 20 matching lines @@
   path=${1:?}
   shift
 
   if ! sudo umount -d "${path}"; then
     warn "Failed to unmount ${path}"
     warn "Doing a lazy unmount"
 
     sudo umount -d -l "${path}" || die "Failed to lazily unmount ${path}"
   fi
 }