2 files changed, 1 insertions, 3 deletions
diff --git a/fullpkg-ng b/fullpkg-ng
index a35eab3..7b97209 100755
--- a/fullpkg-ng
+++ b/fullpkg-ng
@@ -276,6 +276,7 @@ while [ ${#build_packages[@]} -gt 0 ]; do
     check_queue && update_queue || {
 	warning "Couldn't update the queue, let your partners know about this."
     }
+    pkgbuild-check-nonfree || break
     $FULLBUILDCMD; r=$?
     case $r in
 	0) plain "The build was succesful."
diff --git a/pkgbuild-check-nonfree b/pkgbuild-check-nonfree
index 7f04787..774c72f 100755
--- a/pkgbuild-check-nonfree
+++ b/pkgbuild-check-nonfree
@@ -64,9 +64,6 @@ for item in ${pkgname[@]} ${depends[@]} ${makedepends[@]} ; do
 	# if item has a free replacement, use error 16.
 	if in_array $item-libre ${freerep[@]} ; then
 	    warning "$item -> $item-libre"
-	    if [[ $ev -ne 15 ]]; then
-	    	ev=16
-	    fi
 	else
 	    ev=15
             msg2 "found $item"