summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2013-08-15 14:13:49 (EDT)
committer P. J. McDermott <pjm@nac.net>2013-08-15 14:13:49 (EDT)
commita6d2f9e2f8e6d846779f457b06d965557ca19d92 (patch)
tree7a219c4cf9a67c4ac700bcfb233508582afcb270
parentb9f58e09893b700cbc8a377567e8541e603b06b4 (diff)
include_changes(): Read section from changes file.
-rw-r--r--lib/include.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/include.sh b/lib/include.sh
index 1bc999e..0621fc6 100644
--- a/lib/include.sh
+++ b/lib/include.sh
@@ -65,8 +65,8 @@ include_changes()
# suite.
# Set the reference count for the (source, binver, arch, plat) tuple to
# 1.
- script='s/[0-9][0-9]* [^_]*_\([^_]*\)_\([^_]*\)_\([^_]*\)\.opk'
- script="${script}"'/\1 \2 \3/p'
+ 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)"
while read -r binver arch plat; do
@@ -102,11 +102,10 @@ include_changes()
fi
# Include each binary package.
- while read -r size file; do
+ while read -r size sect file; do
if [ "x${file##[ ]}" = 'x' ]; then
continue
fi
- sect='base'
IFS='_' read -r pkg binver arch plat <<-EOF
${file%.opk}
EOF