summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2012-10-27 18:20:03 (EDT)
committer P. J. McDermott <pjm@nac.net>2012-10-27 18:20:03 (EDT)
commitf7b6b151cfad5c071eb28e5ab9b167f2b75c907f (patch)
tree5fc93644166982f108040cce2f10a28c1d06bf6e
parent8f44ced2f88e8775a2f38c6502d67fed063fe6db (diff)
Having no upstream/native sources is not an error.
-rw-r--r--src/ob-unpacksource.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ob-unpacksource.sh b/src/ob-unpacksource.sh
index 9954454..a603393 100644
--- a/src/ob-unpacksource.sh
+++ b/src/ob-unpacksource.sh
@@ -42,7 +42,7 @@ main()
else
if [ -d '../src' ]; then
unpack_native
- else
+ elif get_upstream_archive; then
unpack_upstream
fi
fi
@@ -56,7 +56,6 @@ unpack_native()
unpack_upstream()
{
- get_upstream_archive
get_upstream_compression
get_upstream_dir
extract_upstream
@@ -68,9 +67,11 @@ get_upstream_archive()
upstream_ar="$(find '..' -name "${upstream_ar_base}*")"
case "$(echo "${upstream_ar}" | grep -v '^$' | wc -l)" in
0)
- ob_error "$(ob_get_msg 'no_sources')"
+ ob_info "$(ob_get_msg 'no_sources')"
+ return 1
;;
1)
+ return 0
;;
*)
ob_error "$(ob_get_msg 'multiple_upstream_sources')"