diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2019-08-05 01:31:58 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2019-08-05 01:31:58 +0000 |
| commit | 8a6e7b726fc93908618526a83d8243365ff3ae46 (patch) | |
| tree | 90367516eae2c2fb80909b8df2e2aaa06fb6456c /system/apk-tools/dash.patch | |
| parent | 42b5c5b3b14fc62fb14f529035e24f62862a781c (diff) | |
| parent | c3a4b6cb60e71fc6eba379e858b846859cd46e9a (diff) | |
| download | packages-8a6e7b726fc93908618526a83d8243365ff3ae46.tar.gz packages-8a6e7b726fc93908618526a83d8243365ff3ae46.tar.bz2 packages-8a6e7b726fc93908618526a83d8243365ff3ae46.tar.xz packages-8a6e7b726fc93908618526a83d8243365ff3ae46.zip | |
Merge branch 'arm-fixes' into 'master'
Fixes for issues found on the armv7 builder
See merge request adelie/packages!308
Diffstat (limited to 'system/apk-tools/dash.patch')
| -rw-r--r-- | system/apk-tools/dash.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/system/apk-tools/dash.patch b/system/apk-tools/dash.patch new file mode 100644 index 000000000..811427d3c --- /dev/null +++ b/system/apk-tools/dash.patch @@ -0,0 +1,14 @@ +--- apk-tools-2.10.4/test/solver.sh ++++ apk-tools-2.10.4/test/solver.sh +@@ -11,9 +11,9 @@ TEST_TO_RUN="$@" + fail=0 + pass=0 + for test in ${TEST_TO_RUN:-*.test}; do +- get_block ARGS < $test | xargs $APK_TEST &> .$test.got ++ get_block ARGS < $test | xargs $APK_TEST > .$test.got 2>&1 + +- if ! get_block EXPECT < $test | cmp .$test.got &> /dev/null; then ++ if ! get_block EXPECT < $test | cmp .$test.got > /dev/null 2>&1; then + fail=$((fail+1)) + echo "FAIL: $test" + get_block EXPECT < $test | diff -ru - .$test.got |