Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
abuild
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Adélie Linux
abuild
Commits
ac8b0e55
Commit
ac8b0e55
authored
Sep 16, 2015
by
Carlo Landmeter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
abuild: fix issue in maintainer check
seems the maintainer variable is not set anymore when building .PKGINFO
parent
aa32ec14
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
15 deletions
+15
-15
abuild.in
abuild.in
+15
-15
No files found.
abuild.in
View file @
ac8b0e55
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment