Moved chk_license to db-functions file

Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>

2 files changed, 17 insertions, 23 deletions

diff --git a/db-functions b/db-functions
index f4f9ee9..6611a92 100644
--- a/db-functions
+++ b/db-functions
@@ -110,4 +110,20 @@ get_repos_for_host() {
 	fi
 }
 
+#usage: chk_license ${license[@]}"
+chk_license() {
+    local l
+    for l in "$@"; do
+        l="$(echo $l | tr '[:upper:]' '[:lower:]')"
+        for allowed in ${ALLOWED_LICENSES[@]}; do
+            allowed="$(echo $allowed | tr '[:upper:]' '[:lower:]')"
+            if [ "$l" = "$allowed" ]; then
+                return 0
+            fi
+        done
+    done
+
+    return 1
+}
+
 # vim: set ts=4 sw=4 noet ft=sh:
diff --git a/misc-scripts/make-sourceball b/misc-scripts/make-sourceball
index 462549f..1e7eabc 100755
--- a/misc-scripts/make-sourceball
+++ b/misc-scripts/make-sourceball
@@ -61,33 +61,11 @@ pkgver_from_src() {
     echo $tmp | sed 's|.*-\(.*-.*\)$|\1|g'
 }
 
-#usage: chk_license ${license[@]}"
-chk_license() {
-    #The -f flag skips this check
-    if [ $FORCE = 1 ]; then
-        return 0
-    fi
-
-    local l
-    for l in "$@"; do
-        l="$(echo $l | tr '[:upper:]' '[:lower:]')"
-        for allowed in ${ALLOWED_LICENSES[@]}; do
-            allowed="$(echo $allowed | tr '[:upper:]' '[:lower:]')"
-            if [ "$l" = "$allowed" ]; then
-                return 0
-            fi
-        done
-    done
-
-    return 1
-}
-
 create_srcpackage() {
     if [ -d "$1" ]; then
         pushd "$1" >/dev/null
         . "$BUILDSCRIPT"
-
-        if ! chk_license ${license[@]}; then
+	if ! [ $FORCE == 1 ] && ! chk_license ${license[@]} ; then
             #Removed so as not to clutter failed.txt
             #echo -e "\t$packagename license (${license[@]}) does not require source tarballs" >&2
             cleanup 0