Merge lp:~salgado/linaro-image-tools/fix-duplicate-apt-source-detection into lp:linaro-image-tools/11.11

[Guilherme Salgado]

Make sure we don't add duplicate apt sources when installing a hardware pack

[James Westby (james-w)]

Looks good.

Thanks,

James

review: Approve

[Loïc Minier (lool)]

Consider passing -F to grep to not interpret lines as regexps but as fixed strings.

I suspect this matches commented-out lines too.

[Guilherme Salgado (salgado)]

On Fri, 2010-09-17 at 20:14 +0000, Loïc Minier wrote:
> Consider passing -F to grep to not interpret lines as regexps but as fixed strings.
>
> I suspect this matches commented-out lines too.

Good catches. I've done both changes, thanks!

[lp:~salgado/linaro-image-tools/fix-duplicate-apt-source-detection]

95. By Guilherme Salgado on 2010-09-20

Ignore empty/commented lines when comparing a hwpack's apt sources with the system ones

=== modified file 'linaro-hwpack-install'
--- linaro-hwpack-install	2010-09-14 17:50:19 +0000
+++ linaro-hwpack-install	2010-09-20 16:11:04 +0000
@@ -83,14 +83,19 @@
 # Install the apt sources that contain the packages we need.
 for filename in $(ls "${HWPACK_DIR}"/sources.list.d/); do
   file="${HWPACK_DIR}"/sources.list.d/$filename
+  should_install=0
+  stripped_file=${TEMP_DIR}/$filename
+  grep -v "\(^#\|^\s*$\)" $file > $stripped_file
   while read line; do
-    # Skip any files that contain lines that are already present in the apt
-    # configuration.
-    grep -q "$line" /etc/apt/sources.list.d/* && continue
-    grep -q "$line" /etc/apt/sources.list && continue
-  done < $file
+    # Only install files that have at least one line not present in the
+    # existing sources lists.
+    grep -qF "$line" /etc/apt/sources.list.d/* /etc/apt/sources.list \
+      || should_install=1
+  done < $stripped_file
 
-  sudo cp $file /etc/apt/sources.list.d/hwpack.$filename
+  if [ $should_install -eq 1 ]; then
+    sudo cp $file /etc/apt/sources.list.d/hwpack.$filename
+  fi
 done
 
 # Import the OpenPGP keys for the files installed above.