Commit 92a53bf3 authored by Timo Teräs's avatar Timo Teräs

main/apk-tools: upgrade to 2.10.4

parent 03adca56
From 947baeea1860a4eb44bb8636e1db295a7bc1d259 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 10 Jan 2019 09:29:35 +0100
Subject: [PATCH] fetch: fix error message for --recursive
Give error message for `apk fetch --recursive missing`
---
src/fetch.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/fetch.c b/src/fetch.c
index e745d84..9a7c46a 100644
--- a/src/fetch.c
+++ b/src/fetch.c
@@ -229,8 +229,10 @@ static void mark_name_flags(struct apk_database *db, const char *match, struct a
if (!IS_ERR_OR_NULL(name)) {
name->auto_select_virtual = 1;
apk_deps_add(&ctx->world, &dep);
- } else
+ } else {
ctx->errors++;
+ mark_error(ctx, match, name);
+ }
}
static void mark_names_recursive(struct apk_database *db, struct apk_string_array *args, void *pctx)
--
2.20.1
# Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools pkgname=apk-tools
pkgver=2.10.3 pkgver=2.10.4
pkgrel=1 pkgrel=0
pkgdesc="Alpine Package Keeper - package manager for alpine" pkgdesc="Alpine Package Keeper - package manager for alpine"
subpackages="$pkgname-static" subpackages="$pkgname-static"
depends= depends=
...@@ -13,7 +13,6 @@ if [ "$CBUILD" = "$CHOST" ]; then ...@@ -13,7 +13,6 @@ if [ "$CBUILD" = "$CHOST" ]; then
makedepends="$makedepends lua5.2-dev" makedepends="$makedepends lua5.2-dev"
fi fi
source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz
0001-fetch-fix-error-message-for-recursive.patch
" "
url="https://git.alpinelinux.org/cgit/apk-tools/" url="https://git.alpinelinux.org/cgit/apk-tools/"
...@@ -83,5 +82,4 @@ luaapk() { ...@@ -83,5 +82,4 @@ luaapk() {
mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/ mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/
} }
sha512sums="1b190cfd04c69369bd4f2b708d4df0f8cf2937e1580c95138fd2c2257e7604d015deaca10a9fe0da6742981caadb6b067c15e417a1951866f781b8a5c71c98ee apk-tools-2.10.3.tar.xz sha512sums="d2d9fde0aae9059236f68a3fc2f2186104bb9a099b15d296a6202a20ab2912638f10bb3b9edb70f359d060c5839573c3d50ef37d13095fa01c66dc3219ab6e39 apk-tools-2.10.4.tar.xz"
0fe8d05d6d1c3f6ed5c86d5a5a9aca4fd5246579ed346adb990b8fba6dcac0033056a655181659b4e12a8c934d27df512d29e4e134889a4eafcfbf80e60da2a5 0001-fetch-fix-error-message-for-recursive.patch"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment