diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2010-12-15 13:05:23 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-12-15 13:05:23 +0000 |
commit | 9111206c76923abed8c902d4ae237733dfc54f9a (patch) | |
tree | f4fa55825e06a73ed3012b68ac5dfaa30f420412 | |
parent | f7576ff16641ece40d2919240bc437f6158b3c6d (diff) | |
download | alpine_aports-9111206c76923abed8c902d4ae237733dfc54f9a.tar.bz2 alpine_aports-9111206c76923abed8c902d4ae237733dfc54f9a.tar.xz alpine_aports-9111206c76923abed8c902d4ae237733dfc54f9a.zip |
main/apk-tools: return error when apk info dont find the package
-rw-r--r-- | main/apk-tools/0001-info-return-error-if-owning-package-was-not-found.patch | 44 | ||||
-rw-r--r-- | main/apk-tools/APKBUILD | 6 |
2 files changed, 48 insertions, 2 deletions
diff --git a/main/apk-tools/0001-info-return-error-if-owning-package-was-not-found.patch b/main/apk-tools/0001-info-return-error-if-owning-package-was-not-found.patch new file mode 100644 index 0000000000..a22ef1b407 --- /dev/null +++ b/main/apk-tools/0001-info-return-error-if-owning-package-was-not-found.patch | |||
@@ -0,0 +1,44 @@ | |||
1 | From 4d6e25a8545a647cf80cb48eedb2a4b36715ec3a Mon Sep 17 00:00:00 2001 | ||
2 | From: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Wed, 15 Dec 2010 10:20:30 +0000 | ||
4 | Subject: [PATCH] info: return error if owning package was not found | ||
5 | |||
6 | --- | ||
7 | src/info.c | 9 ++++++--- | ||
8 | 1 files changed, 6 insertions(+), 3 deletions(-) | ||
9 | |||
10 | diff --git a/src/info.c b/src/info.c | ||
11 | index 19a3f48..b16f188 100644 | ||
12 | --- a/src/info.c | ||
13 | +++ b/src/info.c | ||
14 | @@ -101,13 +101,16 @@ static int info_who_owns(struct info_ctx *ctx, struct apk_database *db, | ||
15 | struct apk_package *pkg; | ||
16 | struct apk_dependency_array *deps; | ||
17 | struct apk_dependency dep; | ||
18 | - int i; | ||
19 | + int i, r=0; | ||
20 | |||
21 | apk_dependency_array_init(&deps); | ||
22 | for (i = 0; i < argc; i++) { | ||
23 | pkg = apk_db_get_file_owner(db, APK_BLOB_STR(argv[i])); | ||
24 | - if (pkg == NULL) | ||
25 | + if (pkg == NULL) { | ||
26 | + apk_error("%s: Could not find owner package", argv[i]); | ||
27 | + r++; | ||
28 | continue; | ||
29 | + } | ||
30 | |||
31 | if (apk_verbosity < 1) { | ||
32 | dep = (struct apk_dependency) { | ||
33 | @@ -130,7 +133,7 @@ static int info_who_owns(struct info_ctx *ctx, struct apk_database *db, | ||
34 | } | ||
35 | apk_dependency_array_free(&deps); | ||
36 | |||
37 | - return 0; | ||
38 | + return r; | ||
39 | } | ||
40 | |||
41 | static void info_print_description(struct apk_package *pkg) | ||
42 | -- | ||
43 | 1.7.3.3 | ||
44 | |||
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index 4aedc43945..b6ccebe7d4 100644 --- a/main/apk-tools/APKBUILD +++ b/main/apk-tools/APKBUILD | |||
@@ -1,12 +1,13 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=apk-tools | 2 | pkgname=apk-tools |
3 | pkgver=2.0.7 | 3 | pkgver=2.0.7 |
4 | pkgrel=0 | 4 | pkgrel=1 |
5 | pkgdesc="Alpine Package Keeper - package manager for alpine" | 5 | pkgdesc="Alpine Package Keeper - package manager for alpine" |
6 | subpackages="$pkgname-static" | 6 | subpackages="$pkgname-static" |
7 | depends= | 7 | depends= |
8 | makedepends="zlib-dev openssl-dev pkgconfig" | 8 | makedepends="zlib-dev openssl-dev pkgconfig" |
9 | source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 | 9 | source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 |
10 | 0001-info-return-error-if-owning-package-was-not-found.patch | ||
10 | " | 11 | " |
11 | 12 | ||
12 | url="http://git.alpinelinux.org/cgit/apk-tools/" | 13 | url="http://git.alpinelinux.org/cgit/apk-tools/" |
@@ -48,4 +49,5 @@ static() { | |||
48 | "$subpkgdir"/sbin/apk.static | 49 | "$subpkgdir"/sbin/apk.static |
49 | } | 50 | } |
50 | 51 | ||
51 | md5sums="3c4591c594f9b2261ab588446a50d183 apk-tools-2.0.7.tar.bz2" | 52 | md5sums="3c4591c594f9b2261ab588446a50d183 apk-tools-2.0.7.tar.bz2 |
53 | 1364d38e784ad6cc04e157665903ef0c 0001-info-return-error-if-owning-package-was-not-found.patch" | ||