summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorP. J. McDermott <pj@pehjota.net>2014-05-02 10:41:02 (EDT)
committer P. J. McDermott <pj@pehjota.net>2014-05-02 10:57:58 (EDT)
commit0793d7cb7f6553f4eb1ce527638884f728bf52a3 (patch)
treea396ec1f6dfb8db7d7a98b6ed056ae30aaac1297 /lib
parent82f6e543c08603aaeabbcaa4854d6fd316fed95b (diff)
include_changes(): Warn when there are no files.
Previously, if the package was an upload with an existing source version, the bvaps sanity check would choke. Before: pro-archman: Error: Packages already exist for binary version , architecture , and platform After: pro-archman: Warning: No files to include
Diffstat (limited to 'lib')
-rw-r--r--lib/include.sh11
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/include.sh b/lib/include.sh
index 6127497..42ccf24 100644
--- a/lib/include.sh
+++ b/lib/include.sh
@@ -65,15 +65,20 @@ include_changes()
source="${_include_source}"
srcver="${_include_version}"
+ info "$(get_msg 'include_including')" "${source}" "${srcver}" \
+ "${chan}" "${dist}"
+
+ if [ "x${_include_files}" = 'x' ]; then
+ warn "$(get_msg 'include_no_files')"
+ return 0
+ fi
+
# List of (binver, arch, plat) tuples to be checked later.
script='s/[0-9][0-9]* [^ ][^ ]* [^_]*_\([^_]*\)'
script="${script}"'_\([^_]*\)_\([^_]*\)\.opk/\1 \2 \3/p'
bvaps="$(printf '%s\n' "${_include_files}" | \
sed -n "${script}" | LC_COLLATE='C' sort | uniq)"
- info "$(get_msg 'include_including')" "${source}" "${srcver}" \
- "${chan}" "${dist}"
-
# Pre-inclusion database sanity checks and updates: check for an
# existing version of the package in the suite.
old_ver="$(db_get_srcver "${chan}" "${dist}" "${source}")"