summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2012-11-22 14:16:27 (EST)
committer P. J. McDermott <pjm@nac.net>2012-11-22 14:16:27 (EST)
commita3530e29612b21e965fd869a47c44fc2e6d56d5a (patch)
treedf267f781ff1714d1255bca75adf3e61e8e9144a
parentca90c42aad24b6d5a4002689a48b28b14f24ae18 (diff)
Fix arguments to _ob_parse_changelog_error().
-rw-r--r--lib/changelog.sh24
1 files changed, 13 insertions, 11 deletions
diff --git a/lib/changelog.sh b/lib/changelog.sh
index 00e17f0..db69cfd 100644
--- a/lib/changelog.sh
+++ b/lib/changelog.sh
@@ -61,7 +61,7 @@ ${_obpch_line}"
elif [ "${_obpch_expect}" = 'next_or_eof' ]; then
:
elif [ "${_obpch_expect}" != 'changes_or_trailer' ]; then
- _ob_parse_changelog_error "${_obpch_line_nr}" \
+ _ob_parse_changelog_error "${_obpch_file}" "${_obpch_line_nr}" \
'changelog_found_blank_line' \
"$(_ob_get_changelog_expect_str "${_obpch_expect}")"
else
@@ -71,7 +71,7 @@ ${_obpch_line}"
elif [ "${_obpch_line# }" = "${_obpch_line}" ]; then
if [ "${_obpch_expect}" != 'first_heading' -a \
"${_obpch_expect}" != 'next_or_eof' ]; then
- _ob_parse_changelog_error "${_obpch_line_nr}" \
+ _ob_parse_changelog_error "${_obpch_file}" "${_obpch_line_nr}" \
'changelog_found_heading' \
"$(_ob_get_changelog_expect_str "${_obpch_expect}")"
fi
@@ -83,7 +83,7 @@ ${_obpch_line}"
if [ -z "${_obpch_source}" -o -z "${_obpch_distribution}" -o \
-z "${_obpch_version}" -o \
"${_obpch_version% *}" != "${_obpch_version}" ]; then
- _ob_parse_changelog_error "${_obpch_line_nr}" \
+ _ob_parse_changelog_error "${_obpch_file}" "${_obpch_line_nr}" \
'changelog_bad_heading'
OB_CHANGELOG_SOURCE=
OB_CHANGELOG_VERSION=
@@ -91,11 +91,13 @@ ${_obpch_line}"
OB_CHANGELOG_CHANGES=
else
if ! ob_validate_source_name "${_obpch_source}"; then
- _ob_parse_changelog_error "${_obpch_line_nr}" \
+ _ob_parse_changelog_error \
+ "${_obpch_file}" "${_obpch_line_nr}" \
'changelog_bad_source' "${source}"
fi
if ! ob_parse_version "${_obpch_version}"; then
- _ob_parse_changelog_error "${_obpch_line_nr}" \
+ _ob_parse_changelog_error \
+ "${_obpch_file}" "${_obpch_line_nr}" \
'changelog_bad_source_version' "${_obpch_version}"
fi
OB_CHANGELOG_SOURCE="${_obpch_source}"
@@ -107,7 +109,7 @@ ${_obpch_line}"
_obpch_blank_lines=
elif [ "${_obpch_line# -- }" != "${_obpch_line}" ]; then
if [ "${_obpch_expect}" != 'changes_or_trailer' ]; then
- _ob_parse_changelog_error "${_obpch_line_nr}" \
+ _ob_parse_changelog_error "${_obpch_file}" "${_obpch_line_nr}" \
'changelog_found_trailer' \
"$(_ob_get_changelog_expect_str "${_obpch_expect}")"
fi
@@ -116,7 +118,7 @@ ${_obpch_line}"
_obpch_date="${_obpch_line#* }"
if [ -z "${_obpch_maintainer}" -o -z "${_obpch_date}" -o \
"${_obpch_maintainer}" = "${_obpch_date}" ]; then
- _ob_parse_changelog_error "${_obpch_line_nr}" \
+ _ob_parse_changelog_error "${_obpch_file}" "${_obpch_line_nr}" \
'changelog_bad_trailer'
OB_CHANGELOG_MAINTAINER=
OB_CHANGELOG_DATE=
@@ -132,12 +134,12 @@ ${_obpch_line}"
_obpch_expect='next_or_eof'
_obpch_blank_lines=
elif [ "${_obpch_line# --}" != "${_obpch_line}" ]; then
- _ob_parse_changelog_error "${_obpch_line_nr}" \
+ _ob_parse_changelog_error "${_obpch_file}" "${_obpch_line_nr}" \
'changelog_bad_trailer'
elif [ "${_obpch_line## }" != "${_obpch_line}" ]; then
if [ "${_obpch_expect}" != 'start_changes' -a \
"${_obpch_expect}" != 'changes_or_trailer' ]; then
- _ob_parse_changelog_error "${_obpch_line_nr}" \
+ _ob_parse_changelog_error "${_obpch_file}" "${_obpch_line_nr}" \
'changelog_found_change' \
"$(_ob_get_changelog_expect_str "${_obpch_expect}")"
fi
@@ -146,14 +148,14 @@ ${_obpch_blank_lines}${_obpch_line}"
_obpch_expect='changes_or_trailer'
_obpch_blank_lines=
else
- _ob_parse_changelog_error "${_obpch_line_nr}" \
+ _ob_parse_changelog_error "${_obpch_file}" "${_obpch_line_nr}" \
'changelog_bad_line'
_obpch_blank_lines=
fi
done <"${_obpch_file}"
if [ "${_obpch_expect}" != 'next_or_eof' ]; then
- _ob_parse_changelog_error "${_obpch_line_nr}" \
+ _ob_parse_changelog_error "${_obpch_file}" "${_obpch_line_nr}" \
'changelog_found_eof' \
"$(_ob_get_changelog_expect_str "${_obpch_expect}")"
fi