|
|
@@ -44,11 +44,14 @@ parse_error_msg(struct parsedb_state *ps, const char *fmt)
|
|
|
|
|
|
str_escape_fmt(filename, ps->filename, sizeof(filename));
|
|
|
|
|
|
- if (ps->pkg && ps->pkg->set->name)
|
|
|
+ if (ps->pkg && ps->pkg->set->name) {
|
|
|
+ char pkgname[256];
|
|
|
+
|
|
|
+ str_escape_fmt(pkgname, pkgbin_name(ps->pkg, ps->pkgbin, pnaw_nonambig),
|
|
|
+ sizeof(pkgname));
|
|
|
sprintf(msg, _("parsing file '%.255s' near line %d package '%.255s':\n"
|
|
|
- " %.255s"), filename, ps->lno,
|
|
|
- pkgbin_name(ps->pkg, ps->pkgbin, pnaw_nonambig), fmt);
|
|
|
- else
|
|
|
+ " %.255s"), filename, ps->lno, pkgname, fmt);
|
|
|
+ } else
|
|
|
sprintf(msg, _("parsing file '%.255s' near line %d:\n"
|
|
|
" %.255s"), filename, ps->lno, fmt);
|
|
|
|