diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | dpkg-deb/build.c | 2 | ||||
| -rw-r--r-- | src/unpack.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 82a59e7a7..55b01a230 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ dpkg (1.17.6) UNRELEASED; urgency=low * Remove trailing newlines from dpkg-deb warning message. * Change dpkg-deb conffile name length warning into an error, as dpkg will reject those packages at install time anyway. + * Unify and clarify dpkg-deb and dpkg conffile name length error message. + Closes: #108196 [ Updated scripts translations ] * German (Helge Kreutzmann). diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c index 93ac3940b..e871824b6 100644 --- a/dpkg-deb/build.c +++ b/dpkg-deb/build.c @@ -296,7 +296,7 @@ check_conffiles(const char *dir) ohshite(_("empty string from fgets reading conffiles")); if (conffilename[n - 1] != '\n') - ohshit(_("conffile name '%.50s...' is too long, or missing final newline"), + ohshit(_("conffile name '%s' is too long, or missing final newline"), conffilename); conffilename[n - 1] = '\0'; diff --git a/src/unpack.c b/src/unpack.c index 51efbafd7..66b872fff 100644 --- a/src/unpack.c +++ b/src/unpack.c @@ -629,8 +629,8 @@ void process_archive(const char *filename) { p= conffilenamebuf + strlen(conffilenamebuf); assert(p != conffilenamebuf); if (p[-1] != '\n') - ohshit(_("name of conffile (starting `%.250s') is too long (>%d characters)"), - conffilenamebuf, MAXCONFFILENAME); + ohshit(_("conffile name '%s' is too long, or missing final newline"), + conffilenamebuf); while (p > conffilenamebuf && isspace(p[-1])) --p; if (p == conffilenamebuf) continue; *p = '\0'; |