blob: f405758324d94f7239f20c1cc5bbe13bf6e5e59e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
From ac8b0e55cb2bd122624177a35de51eee24f8a9b2 Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Wed, 16 Sep 2015 22:58:27 +0200
Subject: [PATCH] abuild: fix issue in maintainer check
seems the maintainer variable is not set anymore when building .PKGINFO
---
abuild.in | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/abuild.in b/abuild.in
index 557775e..fd6fb53 100644
--- a/abuild.in
+++ b/abuild.in
@@ -210,7 +210,7 @@ default_sanitycheck() {
[ -n "$pkggroup" ] && spell_error pkggroup pkggroups
[ -n "$subpackage" ] && spell_error subpackage subpackages
- get_maintainer || die "Provide a valid RFC822 maintainer address"
+ check_maintainer || die "Provide a valid RFC822 maintainer address"
makedepends_has 'g++' && warning "g++ should not be in makedepends"
return 0
@@ -721,25 +721,24 @@ git_last_commit() {
git log --format=oneline -n 1 "$startdir" | awk '{print $1}'
}
-# this will try to check for a valid rfc822 address
-check_rfc822() {
- local address="$1"
- case "$address" in
- *[A-Za-z0-9]*\ \<*@*.*\>) ;;
- *) return 1 ;;
- esac
-}
-
get_maintainer() {
if [ -z "$maintainer" ]; then
maintainer=$(awk -F': ' '/\# *Maintainer/ {print $2}' "$APKBUILD")
# remove surrounding whitespace
maintainer=$(echo "$maintainer" | xargs)
- if ! [ -z "$maintainer" ]; then
- check_rfc822 "$maintainer" || return 1
- else
- warning "No maintainer"
- fi
+ fi
+}
+
+check_maintainer() {
+ get_maintainer
+ if [ -z "$maintainer" ]; then
+ warning "No maintainer"
+ else
+ # try to check for a valid rfc822 address
+ case "$maintainer" in
+ *[A-Za-z0-9]*\ \<*@*.*\>) ;;
+ *) return 1 ;;
+ esac
fi
}
@@ -805,6 +804,7 @@ EOF
fi
echo "commit = $last_commit" >> "$pkginfo"
+ get_maintainer
if [ -n "$maintainer" ]; then
echo "maintainer = $maintainer" >> "$pkginfo"
fi
--
2.5.2
|
