[pacman-dev] [PATCH 1/2] makepkg: abstract license check into separate function

Dave Reisner d at falconindy.com
Sat Jan 7 13:27:14 EST 2012


Signed-off-by: Dave Reisner <dreisner at archlinux.org>
---
 scripts/makepkg.sh.in |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 13185ee..eada195 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1102,6 +1102,15 @@ find_libprovides() {
 	done
 }
 
+check_license() {
+	# TODO maybe remove this at some point
+	# warn if license array is not present or empty
+	if [[ -z $license ]]; then
+		warning "$(gettext "Please add a license line to your %s!")" "$BUILDSCRIPT"
+		plain "$(gettext "Example for GPL\'ed software: %s.")" "license=('GPL')"
+	fi
+}
+
 write_pkginfo() {
 	local builddate=$(date -u "+%s")
 	if [[ -n $PACKAGER ]]; then
@@ -1179,12 +1188,7 @@ write_pkginfo() {
 		fi
 	done
 
-	# TODO maybe remove this at some point
-	# warn if license array is not present or empty
-	if [[ -z $license ]]; then
-		warning "$(gettext "Please add a license line to your %s!")" "$BUILDSCRIPT"
-		plain "$(gettext "Example for GPL\'ed software: %s.")" "license=('GPL')"
-	fi
+	check_license
 }
 
 check_package() {
-- 
1.7.8.1



More information about the pacman-dev mailing list