fullpkg:

* check_queue only fails if pkg is in queue
* if pkg in queue do not build
* nonfree are only anounced at finishing

1 files changed, 6 insertions, 3 deletions

diff --git a/fullpkg-ng b/fullpkg-ng
index 7dda8d2..1811771 100755
--- a/fullpkg-ng
+++ b/fullpkg-ng
@@ -73,7 +73,7 @@ remove_queue() {
 
 # Checks if a package is listed
 check_queue() {
-    get_queue || return $?
+    get_queue
 
     local packager=$(grep -w "$(basename $PWD)" ${queue_file} | cut -d ':' -f2)
 
@@ -175,12 +175,15 @@ function find_deps {
 force_build=""
 level=0
 noupdate='n'
+build_only='n'
 check_deps_only='n'
 max_level=21
 while getopts 'ha:cd:l:nm:' arg; do
     case $arg in
 	h) usage; exit 0 ;;
 	a) ABSROOT="$OPTARG" ;;
+	# TODO: build only, require also build_dir
+	# b) build_only='y'
 	c) check_deps_only='y' ;;
 	# f) force_build+="-f pkgname " ;;
 	d) build_dir="$OPTARG" ;;
@@ -273,11 +276,11 @@ while [ ${#build_packages[@]} -gt 0 ]; do
 	sed -i "s/^\(arch=([^)anym]\+\))/\1 'mips64el')/" "PKGBUILD"
     fi
     # Check if pkg is being built, if it's not let everybody know we're building this.
-    check_queue && update_queue || {
+    check_queue || continue
+    update_queue || {
 	warning "Couldn't update the queue, let your partners know about this."
     }
     pkgbuild-check-nonfree || [ $? -eq 15 ] && {
-	error "nonfree deps found in $(basename $PWD)"
 	echo "nonfree:$(basename $PWD)" >> $build_dir/log
 	egrep -vwh ${build_packages[0]} $buildorder > $buildorder.2
 	continue