1. Forum
  2. Usenet
  3. LINUX.DEBIAN.MAINT.DPKG

  • Re: [dpkg] 16/30: src: Use DEBEXT instead of hard-coding ".deb"

    From Sven Joachim@21:1/5 to Guillem Jover on Wed Oct 18 18:10:01 2023
    On 2023-10-18 01:21 +0200, Guillem Jover wrote:

    commit db1de20385ff04579ad3cb421e3dcc62f1df13f4
    Author: Guillem Jover <guillem@debian.org>
    AuthorDate: Mon Sep 11 22:46:05 2023 +0200

    src: Use DEBEXT instead of hard-coding ".deb"
    ---
    src/main/archives.c | 2 +-
    src/split/main.c | 2 +-
    src/split/split.c | 4 ++--
    3 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/src/split/main.c b/src/split/main.c
    index eba2333c3..c6ae37402 100644
    --- a/src/split/main.c
    +++ b/src/split/main.c
    @@ -87,7 +87,7 @@ usage(const char *const *argv)
    " --root <directory> Use <directory> instead of %s.\n"
    " -S, --partsize <size> In KiB, for -s (default is 450).\n"
    " -o, --output <file> Filename, for -j (default is\n"
    -" <package>_<version>_<arch>.deb).\n"
    +" <package>_<version>_<arch>" DEBEXT ").\n"
    " -Q, --npquiet Be quiet when -a is not a part.\n"
    " --msdos Generate 8.3 filenames.\n"
    "\n"), ADMINDIR, PARTSDIR, ADMINDIR, "/");

    Unfortunately this breaks translations. On my system xgettext failed to
    expand the DEBEXT macro and cut off everything after it from the msgid
    in dpkg.pot. This is how it looks like:

    ,----
    | #: src/split/main.c
    | #, c-format
    | msgid ""
    | "Options:\n"
    | " --depotdir <directory> Use <directory> instead of %s/%s.\n"
    | " --admindir <directory> Use <directory> instead of %s.\n"
    | " --root <directory> Use <directory> instead of %s.\n"
    | " -S, --partsize <size> In KiB, for -s (default is 450).\n"
    | " -o, --output <file> Filename, for -j (default is\n"
    | " <package>_<version>_<arch>"
    | msgstr ""
    `----

    Cheers,
    Sven

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)
  • From Guillem Jover@21:1/5 to Sven Joachim on Wed Oct 18 18:40:02 2023
    Hi!

    On Wed, 2023-10-18 at 18:02:07 +0200, Sven Joachim wrote:
    On 2023-10-18 01:21 +0200, Guillem Jover wrote:

    diff --git a/src/split/main.c b/src/split/main.c
    index eba2333c3..c6ae37402 100644
    --- a/src/split/main.c
    +++ b/src/split/main.c
    @@ -87,7 +87,7 @@ usage(const char *const *argv)
    " --root <directory> Use <directory> instead of %s.\n"
    " -S, --partsize <size> In KiB, for -s (default is 450).\n"
    " -o, --output <file> Filename, for -j (default is\n"
    -" <package>_<version>_<arch>.deb).\n" +" <package>_<version>_<arch>" DEBEXT ").\n"
    " -Q, --npquiet Be quiet when -a is not a part.\n"
    " --msdos Generate 8.3 filenames.\n"
    "\n"), ADMINDIR, PARTSDIR, ADMINDIR, "/");

    Unfortunately this breaks translations. On my system xgettext failed to expand the DEBEXT macro and cut off everything after it from the msgid
    in dpkg.pot. This is how it looks like:

    Err, right, xgettext does not handle anything but literal strings, for
    some reason missed that here. I've reverted this part and pushed, thanks!

    Thanks,
    Guillem

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)