Merge lp://qastaging/~emanuele-aina/linaro-image-tools/fix-apt-source-dup-detect into lp://qastaging/linaro-image-tools/11.11
Proposed by
Emanuele Aina
Status: | Merged |
---|---|
Merged at revision: | 534 |
Proposed branch: | lp://qastaging/~emanuele-aina/linaro-image-tools/fix-apt-source-dup-detect |
Merge into: | lp://qastaging/linaro-image-tools/11.11 |
Diff against target: |
11 lines (+1/-1) 1 file modified
linaro-hwpack-install (+1/-1) |
To merge this branch: | bzr merge lp://qastaging/~emanuele-aina/linaro-image-tools/fix-apt-source-dup-detect |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Loïc Minier (community) | Approve | ||
Review via email: mp+113556@code.qastaging.launchpad.net |
Description of the change
Fixes bug #1018941 (APT source duplicates detection fails if there are no files in /etc/apt/
To post a comment you must log in.
On Thu, Jul 05, 2012, Emanuele Aina wrote: sources. list.d/ * /etc/apt/ sources. list \ sources. list.d/ *.list" ) /etc/apt/ sources. list \
> - grep -qF "$line" /etc/apt/
> + grep -qF "$line" $(sh -sc "echo /etc/apt/
Not sure why the -s flag to sh, but there is at least one superfluous
fork here: subshell + running sh.
Perhaps simply: sources. list.d/ -name \*.list) \ etc/apt/ sources. list
grep -qF "$line" $(find /etc/apt/
/
--
Loïc Minier