This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=d2c84c7e454c0b5b77b9e6047755fff98b7861ee commit d2c84c7e454c0b5b77b9e6047755fff98b7861ee Author: Guillem Jover <[email protected]> AuthorDate: Thu Aug 21 03:27:33 2025 +0200 dselect, libdpkg: Use Ctrl+<name> instead of ^<name> in messages Make the output more clear and user friendly. --- dselect/main.cc | 4 ++-- dselect/methods/ftp/install.pl | 4 ++-- dselect/methods/ftp/setup.pl | 4 ++-- dselect/methods/ftp/update.pl | 2 +- lib/dpkg/parse.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dselect/main.cc b/dselect/main.cc index 1e8316007..7773ad827 100644 --- a/dselect/main.cc +++ b/dselect/main.cc @@ -417,8 +417,8 @@ refreshmenu(void) attrset(A_BOLD); addstr(_("\n\n" - "Move around with ^P and ^N, cursor keys, initial letters, or digits;\n" - "Press <enter> to confirm selection. ^L redraws screen.\n\n")); + "Move around with Ctrl+P and Ctrl+N, cursor keys, initial letters, or digits;\n" + "Press <enter> to confirm selection. Ctrl+L redraws screen.\n\n")); attrset(A_NORMAL); addstr(_("Copyright (C) 1994-1996 Ian Jackson.\n" diff --git a/dselect/methods/ftp/install.pl b/dselect/methods/ftp/install.pl index a1908f00d..a4260c410 100755 --- a/dselect/methods/ftp/install.pl +++ b/dselect/methods/ftp/install.pl @@ -391,11 +391,11 @@ sub download { return 0; } -# download stuff (protect from ^C) +# download stuff (protect from Ctrl+C) if($totsize != 0) { if (yesno('y', "\nDo you want to download the required files")) { DOWNLOAD_TRY: while (1) { - print "Downloading files... use ^C to stop\n"; + print "Downloading files... (use Ctrl+C to stop)\n"; eval { if ((download() == 1) && yesno('y', "\nDo you want to retry downloading at once")) { diff --git a/dselect/methods/ftp/setup.pl b/dselect/methods/ftp/setup.pl index feaf82684..e082bc74c 100755 --- a/dselect/methods/ftp/setup.pl +++ b/dselect/methods/ftp/setup.pl @@ -146,8 +146,8 @@ sub download { } } -# download stuff (protect from ^C) -print "\nUsing FTP to check directories...(stop with ^C)\n\n"; +# download stuff (protect from Ctrl+C) +print "\nUsing FTP to check directories... (use Ctrl+C to stop)\n\n"; eval { local $SIG{INT} = sub { die "interrupted!\n"; diff --git a/dselect/methods/ftp/update.pl b/dselect/methods/ftp/update.pl index 6ffd14b75..283170c02 100755 --- a/dselect/methods/ftp/update.pl +++ b/dselect/methods/ftp/update.pl @@ -64,7 +64,7 @@ read_config("$vardir/methods/ftp/vars"); chdir "$vardir/methods/ftp"; -print "Getting Packages files...(stop with ^C)\n\n"; +print "Getting Packages files... (use Ctrl+C to stop)\n\n"; my @pkgfiles; my $ftp; diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c index da9962429..718dc1b6e 100644 --- a/lib/dpkg/parse.c +++ b/lib/dpkg/parse.c @@ -658,7 +658,7 @@ parse_stanza(struct parsedb_state *ps, struct field_state *fs, parse_error(ps, _("newline in field name '%.*s'"), fs->fieldlen, fs->fieldstart); if (c == MSDOS_EOF_CHAR) - parse_error(ps, _("MSDOS end of file (^Z) in field name '%.*s'"), + parse_error(ps, _("MSDOS end of file (Ctrl+Z) in field name '%.*s'"), fs->fieldlen, fs->fieldstart); if (c != ':') parse_error(ps, @@ -675,7 +675,7 @@ parse_stanza(struct parsedb_state *ps, struct field_state *fs, parse_error(ps, _("end of file before value of field '%.*s' (missing final newline)"), fs->fieldlen, fs->fieldstart); if (c == MSDOS_EOF_CHAR) - parse_error(ps, _("MSDOS end of file (^Z) in value of field '%.*s' (missing newline?)"), + parse_error(ps, _("MSDOS end of file (Ctrl+Z) in value of field '%.*s' (missing newline?)"), fs->fieldlen, fs->fieldstart); blank_line = false; -- Dpkg.Org's dpkg
