diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 534: Merge lp:~emanuele-aina/linaro-image-tools/fix-apt-source-dup-detect; fixes

Message ID 20120705170019.835.34417.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

loic.minier@linaro.org July 5, 2012, 5 p.m. UTC 
Merge authors:
  Emanuele Aina (emanuele-aina)
Related merge proposals:
  https://code.launchpad.net/~emanuele-aina/linaro-image-tools/fix-apt-source-dup-detect/+merge/113556
  proposed by: Emanuele Aina (emanuele-aina)
  review: Approve - Loïc Minier (lool)
------------------------------------------------------------
revno: 534 [merge]
fixes bug: https://launchpad.net/bugs/687608
committer: Loïc Minier <loic.minier@linaro.org>
branch nick: linaro-image-tools
timestamp: Thu 2012-07-05 18:56:26 +0200
message:
  Merge lp:~emanuele-aina/linaro-image-tools/fix-apt-source-dup-detect; fixes
  parsing of APT sources when /etc/apt/source.list.d/ is empty; thanks Emanuele
  Aina; LP: #687608.
modified:
  linaro-hwpack-install


--
lp:linaro-image-tools
https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk

You are subscribed to branch lp:linaro-image-tools.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'linaro-hwpack-install'
--- linaro-hwpack-install	2012-04-12 11:26:32 +0000
+++ linaro-hwpack-install	2012-07-05 14:44:04 +0000
@@ -138,7 +138,7 @@ 
   while read line; do
     # 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 \
+    grep -qF "$line" $(find /etc/apt/sources.list.d/ -name '*.list') /etc/apt/sources.list \
       || should_install=1
   done < $stripped_file