diff options
| author | P. J. McDermott <pj@pehjota.net> | 2014-05-13 16:29:50 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pj@pehjota.net> | 2014-05-13 16:29:50 (EDT) |
| commit | 7a4dc7679b75d15469fecaf37a81221cd0366dfc (patch) | |
| tree | d3fed4f919b91465c60438083bd86daa7e56b0bb /patches | |
| parent | a12b73bf4fb0de46b01609f402826253fb4f1a2c (diff) | |
Add patch to fix build dep status check.
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/02_ob-checkbuilddeps-fix-status-check.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/patches/02_ob-checkbuilddeps-fix-status-check.patch b/patches/02_ob-checkbuilddeps-fix-status-check.patch new file mode 100644 index 0000000..81d6f01 --- /dev/null +++ b/patches/02_ob-checkbuilddeps-fix-status-check.patch @@ -0,0 +1,28 @@ +From: "P. J. McDermott" <pj@pehjota.net> +Origin: upstream, http://git.proteanos.com/opkbuild/opkbuild.git/commit/?id=6208979 +Date: Tue, 13 May 2014 16:25:36 -0400 +Subject: ob-checkbuilddeps: Fix status check. + +This was breaking on packages with a status field like: + + Status: install user installed +--- + src/ob-checkbuilddeps.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ob-checkbuilddeps.sh b/src/ob-checkbuilddeps.sh +index 6b41416..6005563 100644 +--- a/src/ob-checkbuilddeps.sh ++++ b/src/ob-checkbuilddeps.sh +@@ -81,7 +81,7 @@ check_dep() + ob_parse_dep -p dep_pkg -r dep_rel -v dep_ver "${dep}" + status="$(@@OPKG@@ status "${dep_pkg}")" + +- if ! printf '%s\n' "${status}" | grep '^Status: .*ok installed$' \ ++ if ! printf '%s\n' "${status}" | grep '^Status: .* .* installed$' \ + >/dev/null 2>&1; then + return 1 + fi +-- +1.8.5.3 + |