aboutsummaryrefslogtreecommitdiffstats
path: root/main/apk-tools
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-04-10 17:36:02 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-04-10 17:36:02 +0000
commit42953ed490a8b4d832288b37fe8418dcf0d69dcd (patch)
tree9423046ad15b4c1b0d4b54200e6b6ba5420e09bd /main/apk-tools
parent8abc2e989fbd0842a5ac2b22149d9831df5a9906 (diff)
downloadaports-42953ed490a8b4d832288b37fe8418dcf0d69dcd.tar.bz2
aports-42953ed490a8b4d832288b37fe8418dcf0d69dcd.tar.xz
main/apk-tools: return errors with apk update --quiet
ref #4040
Diffstat (limited to 'main/apk-tools')
-rw-r--r--main/apk-tools/0001-update-return-errors-also-with-quiet.patch26
-rw-r--r--main/apk-tools/APKBUILD12
2 files changed, 34 insertions, 4 deletions
diff --git a/main/apk-tools/0001-update-return-errors-also-with-quiet.patch b/main/apk-tools/0001-update-return-errors-also-with-quiet.patch
new file mode 100644
index 0000000000..62a8e525c9
--- /dev/null
+++ b/main/apk-tools/0001-update-return-errors-also-with-quiet.patch
@@ -0,0 +1,26 @@
+From 2322ba0ad938c142d0bb7a715940fc75ccdbe91b Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Fri, 10 Apr 2015 17:33:21 +0000
+Subject: [PATCH] update: return errors also with --quiet
+
+fixes #4040
+---
+ src/update.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/update.c b/src/update.c
+index 84833ec..72e8673 100644
+--- a/src/update.c
++++ b/src/update.c
+@@ -23,7 +23,7 @@ static int update_main(void *ctx, struct apk_database *db, struct apk_string_arr
+ char buf[32] = "OK:";
+
+ if (apk_verbosity < 1)
+- return 0;
++ return db->repo_update_errors;
+
+ for (i = 0; i < db->num_repos; i++) {
+ repo = &db->repos[i];
+--
+2.3.5
+
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index cc83860060..5cedfd4b8b 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
pkgver=2.6.0_rc1
-pkgrel=1
+pkgrel=2
pkgdesc="Alpine Package Keeper - package manager for alpine"
subpackages="$pkgname-static"
depends=
@@ -14,6 +14,7 @@ if [ "$CBUILD" = "$CHOST" ]; then
fi
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz
0001-use-memmove-for-copying-buffer-leftovers-as-the-rang.patch
+ 0001-update-return-errors-also-with-quiet.patch
"
url="http://git.alpinelinux.org/cgit/apk-tools/"
@@ -84,8 +85,11 @@ luaapk() {
}
md5sums="c9515f2063d31e4dc7583e6b3d3b8ab0 apk-tools-2.6.0_rc1.tar.xz
-b6ad09951c806fa6d2ca5d1f3c316dff 0001-use-memmove-for-copying-buffer-leftovers-as-the-rang.patch"
+b6ad09951c806fa6d2ca5d1f3c316dff 0001-use-memmove-for-copying-buffer-leftovers-as-the-rang.patch
+fe789514899ba733580aac81fc88f346 0001-update-return-errors-also-with-quiet.patch"
sha256sums="41f87b45998bee0154a86d4e408ed014248abd713ca7d04b529b3d53b9af2fba apk-tools-2.6.0_rc1.tar.xz
-01cedfd97bcbbeee309a1293c65a0e734c0b894f65b543330d564c648f91f3c4 0001-use-memmove-for-copying-buffer-leftovers-as-the-rang.patch"
+01cedfd97bcbbeee309a1293c65a0e734c0b894f65b543330d564c648f91f3c4 0001-use-memmove-for-copying-buffer-leftovers-as-the-rang.patch
+a4c93b5ef9810384a55d92d5e0611cf4323be60673283ee270fa0582723329e3 0001-update-return-errors-also-with-quiet.patch"
sha512sums="899706b2d440d4c28c3a8715514d3b32a0aea489ff48e5e1af658c167a2197f7d6e642182149f32744cd4c78d981ee4eb0f8588f07b365c6b8be04e1da3cf105 apk-tools-2.6.0_rc1.tar.xz
-4e26becda63fd1664fb1625487eedc4cb1b7b8155a65ac317e7c0583e3e9f203fe7cab7498463e6f9552ac71d9dbac48c1eba5926dc1f29481cef7d9a691c1ed 0001-use-memmove-for-copying-buffer-leftovers-as-the-rang.patch"
+4e26becda63fd1664fb1625487eedc4cb1b7b8155a65ac317e7c0583e3e9f203fe7cab7498463e6f9552ac71d9dbac48c1eba5926dc1f29481cef7d9a691c1ed 0001-use-memmove-for-copying-buffer-leftovers-as-the-rang.patch
+d50d4b7e6b4e8cc85526c86439d4e3a365e84a8581738bc942b4881f4158b6438e31c906170ec06a9d809a07ed7150449b771a0435a10f433cbb7b8650aad416 0001-update-return-errors-also-with-quiet.patch"