Because of the nesting of the function calls a call to error inside the

stack will not give me the exit I want. This should catch any errors and
cause an exit in the appropriate place.

buildpkg.functions

@@ -376,6 +376,8 @@ unpack()
     # Note observe order here, since get_source_absfilename can exit with $E_BAD_FILE this
     # provides context for resolving!
     absfile="$(get_source_absfilename $snum)"
+    # Catch any badness from the get_source function stack
+    [ "$?" != "0" ] && error $E_BAD_FILE unpack
     # Determine filetype and unpack
     case $suffix in
 	'tar') ${__tar} -xf $absfile;;