diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2020-12-08 01:57:33 (EST) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2020-12-08 01:57:33 (EST) |
| commit | 7100eb7de881fe58454f19913c5444a26eb4f167 (patch) | |
| tree | 4de24e3116d3584865d1d4c962270f76525724df | |
| parent | 1af95b30a2e88083e2cc739f259be8feb9038881 (diff) | |
ob-gencontrol: Normalize B-D field spacing
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | src/ob-gencontrol.sh | 13 |
2 files changed, 17 insertions, 2 deletions
@@ -5,6 +5,12 @@ Released: ????-??-?? "Now winterized to prevent freezing in December!" +Utilities: + + * ob-gencontrol now strips newlines from "Build-Depends" fields + instead of generating invalid control files. All spacing of + dependency control fields is now normalized using ob_parse_dep(). + libopkbuild: * ob_iso8601_gmtime() and ob_touch_t_gmtime() no longer trigger an diff --git a/src/ob-gencontrol.sh b/src/ob-gencontrol.sh index 5a8aa40..1c0da12 100644 --- a/src/ob-gencontrol.sh +++ b/src/ob-gencontrol.sh @@ -67,6 +67,8 @@ gen_control_src() local binary= local name= local value= + local deps= + local dep= local homepage= binary="src:${OPK_SOURCE}" @@ -91,8 +93,15 @@ gen_control_src() if [ -z "${value}" ]; then continue fi - value="$(ob_substvars "${value}")" - printf '%s: %s\n' "${name}" "${value}" | sed 's/[, ]*$//' >&3 + deps='' + IFS=',' + for dep in ${value}; do + unset IFS + deps="${deps}$(ob_parse_dep "${dep}"), " + done + unset IFS + value="$(ob_substvars "${deps}")" + printf '%s: %s\n' "${name}" "${deps}" | sed 's/[, ]*$//' >&3 done cat >&3 <<-EOF |