diff options
author | A. Wilcox <awilcox@wilcox-tech.com> | 2021-01-14 18:07:13 +0000 |
---|---|---|
committer | A. Wilcox <awilcox@wilcox-tech.com> | 2021-01-14 18:07:13 +0000 |
commit | a0a60473fd05e9479fd17ff168ba67f9cc73ad74 (patch) | |
tree | 11d236248fd6545a2a766f0115acf29731945648 /system/apk-tools/dash.patch | |
parent | 1d427323c0d25cd1a81674c2b124f93245bbb091 (diff) | |
parent | aa6e477aa00f7eb9ab556591465d571e2400120f (diff) | |
download | packages-a0a60473fd05e9479fd17ff168ba67f9cc73ad74.tar.gz packages-a0a60473fd05e9479fd17ff168ba67f9cc73ad74.tar.bz2 packages-a0a60473fd05e9479fd17ff168ba67f9cc73ad74.tar.xz packages-a0a60473fd05e9479fd17ff168ba67f9cc73ad74.zip |
Merge branch 'bump/apk-tools' into 'master'
system/apk-tools: bump to 2.12.0
See merge request adelie/packages!595
Diffstat (limited to 'system/apk-tools/dash.patch')
-rw-r--r-- | system/apk-tools/dash.patch | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/system/apk-tools/dash.patch b/system/apk-tools/dash.patch deleted file mode 100644 index 5847d87df..000000000 --- a/system/apk-tools/dash.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- apk-tools-2.10.4/test/solver.sh -+++ apk-tools-2.10.4/test/solver.sh -@@ -10,9 +10,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 |