* find_deps does not show grep errors

* find_deps logs not found deps
* non free deps are checked before building
* non free deps are anounced at finishing

1 files changed, 13 insertions, 5 deletions

diff --git a/fullpkg-ng b/fullpkg-ng
index e963273..8a3c7aa 100755
--- a/fullpkg-ng
+++ b/fullpkg-ng
@@ -153,15 +153,15 @@ function find_deps {
 	    # if search pkgname in repo doesn't work
 	    # this should find pkgsplits
 	    _dir=$(find "$ABSROOT/${_repo}" -type f -name PKGBUILD -print0 | \
-		"xargs" -0 -e grep -H -Ew grep $_dep > /dev/null ) && {
+		"xargs" -0 -e grep -H -Ew grep $_dep >/dev/null 2>&1) && {
 		pushd $(dirname $(echo $_dir | cut -d: -f1)) > /dev/null
 		$0 -c -d ${build_dir} -l ${next_level}
 		# Circular deps must fail
 		[ $? -eq 20 ] && return 20
 		popd > /dev/null
 	    } &&  break 1 # found, go to next dep
-	    echo "dep_not_found:$_dep" >> $build_dir/log
 	done
+	echo "dep_not_found:$_dep" >> $build_dir/log
     done
     unset next_level dir
     # unset PKGBUILD variables
@@ -276,7 +276,11 @@ 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
+    pkgbuild-check-nonfree || [ $? -eq 15 ] {
+	error "nonfree deps found in $(basename $PWD)"
+	echo "nonfree:$(basename $PWD)"
+	continue
+    }
     $FULLBUILDCMD; r=$?
     case $r in
 	0) plain "The build was succesful."
@@ -286,9 +290,9 @@ while [ ${#build_packages[@]} -gt 0 ]; do
 	    cleanup "$(basename $PWD)" 
 	    ;;
 	1) error "There were errors while trying to build the package." 
-	    echo "failed: $(basename $PWD)" >> $build_dir/log ;;
+	    echo "failed:$(basename $PWD)" >> $build_dir/log ;;
 	2) error "The build failed."
-	    echo "failed: $(basename $PWD)" >> $build_dir/log ;;
+	    echo "failed:$(basename $PWD)" >> $build_dir/log ;;
     esac
     egrep -vw ${build_packages[0]} $buildorder > $buildorder.2
     mv $buildorder.2 $buildorder
@@ -296,6 +300,10 @@ while [ ${#build_packages[@]} -gt 0 ]; do
     popd > /dev/null
 done
 
+pkgs=$(cat $build_dir/log | grep "nonfree:") && {
+    error "Those packages contain nonfree deps:"
+    plain "$(echo ${pkgs[@]} | cut -d: -f2)"
+}
 pkgs=$(cat $build_dir/log | grep "built:") && {
     error "Those packages were built and installed:"
     plain "$(echo ${pkgs[@]} | cut -d: -f2)"