Merge lp:~salgado/linaro-image-tools/bug-637419 into lp:linaro-image-tools/11.11

[Guilherme Salgado]

Make sure the packages contained in the hwpack take precedence over the ones coming from other sources. Also fixes handling of the --install-latest argument.

[James Westby (james-w)]

Looks good.

Thanks,

James

review: Approve

=== modified file 'linaro-hwpack-install'
--- linaro-hwpack-install	2010-09-13 14:47:36 +0000
+++ linaro-hwpack-install	2010-09-14 18:15:55 +0000
@@ -25,8 +25,9 @@
 LOCKFILE="/var/lock/hwpack"
 TEMP_DIR=$(mktemp -d)
 HWPACK_DIR="${TEMP_DIR}/unpacked"
-HWPACK_PKGS_SOURCE=/etc/apt/sources.list.d/hwpack-pkgs.list
-INSTALL_LATEST=0
+INSTALL_LATEST="no"
+SOURCES_LIST_FILE="${TEMP_DIR}/sources.list"
+APT_GET_OPTIONS="Dir::Etc::SourceList=${SOURCES_LIST_FILE}"
 
 die() {
   echo -e "$@"
@@ -42,7 +43,7 @@
   if [ $1 != "--install-latest" ]; then
     die "Unknown argument: $1 \n$usage_msg"
   fi
-  INSTALL_LATEST=$1
+  INSTALL_LATEST="yes"
   HWPACK_TARBALL=$2
 else
   die $usage_msg
@@ -57,7 +58,6 @@
   # Ensure our temp dir and apt sources are removed.
   echo -n "Cleaning up ..."
   rm -rf $TEMP_DIR
-  sudo rm -f $HWPACK_PKGS_SOURCE
   sudo apt-get update -qq
   echo "Done"
 }
@@ -99,16 +99,19 @@
   sudo apt-key add $file
 done
 
-# Add one extra apt source for the packages included in the hwpack.
-sudo sh -c "echo deb file:${HWPACK_DIR}/pkgs ./ > $HWPACK_PKGS_SOURCE"
+# Add one extra apt source for the packages included in the hwpack and make
+# sure it's the first on the list of sources so that it gets precedence over
+# the others.
+echo "deb file:${HWPACK_DIR}/pkgs ./" > "$SOURCES_LIST_FILE"
+cat /etc/apt/sources.list >> "$SOURCES_LIST_FILE"
 
-sudo apt-get update -qq
+sudo apt-get -o "$APT_GET_OPTIONS" update -qq
 
 echo -n "Installing packages ..."
-if [ $INSTALL_LATEST -ne 0 ]; then
+if [ "$INSTALL_LATEST" == "no" ]; then
   packages=`sed 's/=.*//' "${HWPACK_DIR}"/manifest`
 else
   packages=`cat "${HWPACK_DIR}"/manifest`
 fi
-sudo apt-get install $packages
+sudo apt-get -o "$APT_GET_OPTIONS" install $packages
 echo "Done"