This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=3e3c4b160a4fe21ec73539a8cf5b013ea05ff99e commit 3e3c4b160a4fe21ec73539a8cf5b013ea05ff99e (HEAD -> master) Author: Guillem Jover <guil...@debian.org> AuthorDate: Sat Feb 1 04:16:46 2020 +0100 dpkg, dselect: Stop using first-person singular in output messages It is very strange reading the computer/program talk to the user in first-person singular, and it's a practice that has been discouraged for a while now. --- debian/changelog | 1 + dselect/helpmsgs.cc | 2 +- dselect/methods/disk/install | 16 ++++++++-------- dselect/methods/disk/setup | 16 ++++++++-------- dselect/methods/multicd/install | 20 ++++++++++---------- dselect/methods/multicd/setup | 26 +++++++++++++------------- lib/dpkg/parse.c | 2 +- src/archives.c | 2 +- 8 files changed, 43 insertions(+), 42 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4852b226b..62fb753c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -72,6 +72,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium - Remove multi_mount method, as the multi_cd method can take care of mounting the necessary images or devices. - Replace changelog with correct copyright in file header. + * dpkg, dselect: Stop using first-person singular in output messages. * Perl modules: - Dpkg::Source::Package: Verify original tarball signatures at build time. - Dpkg::BuildFlags: Add new unset() method. diff --git a/dselect/helpmsgs.cc b/dselect/helpmsgs.cc index b101fc8bc..54d3e6a8a 100644 --- a/dselect/helpmsgs.cc +++ b/dselect/helpmsgs.cc @@ -115,7 +115,7 @@ the problem(s), and go back to the main list, by pressing capital 'X'.\n\n\ You can also move around the list and change the markings so that they are more\n\ like what you want, and you can 'reject' my suggestions by using the capital\n\ 'D' or 'R' keys (see the keybindings help screen). You can use capital 'Q' to\n\ -force me to accept the situation currently displayed, in case you want to\n\ +force to accept the situation currently displayed, in case you want to\n\ override a recommendation or think that the program is mistaken.\n\n\ \ Press <space> to leave help and enter the sub-list; remember: press '?' for help.\n") diff --git a/dselect/methods/disk/install b/dselect/methods/disk/install index a4d69ad02..9ba50fa36 100755 --- a/dselect/methods/disk/install +++ b/dselect/methods/disk/install @@ -96,15 +96,15 @@ do if (!length($invoke)) { warn " -Oh dear, I need to install or upgrade $package, but I don'\''t see -the appropriate file(s) anywhere. I'\''m expecting version $version or -later, as that is listed in the Packages file. +Cannot find the appropriate file(s) anywhere needed to install or upgrade +package $package. Expecting version $version or later, as listed in the +Packages file. -Perhaps you downloaded it with an unexpected name, or something. -In any case, you must find the file(s) and then either place it with -the correct filename(s) (as listed in the Packages file or in -$vardir/available) and rerun the installation, or upgrade the -package by using '\''dpkg --install --auto-deconfigure'\'' by hand. +Perhaps the package was downloaded with an unexpected name? In any case, +you must find the file(s) and then either place it with the correct +filename(s) (as listed in the Packages file or in $vardir/available) +and rerun the installation, or upgrade the package by using +\"dpkg --install --auto-deconfigure" by hand. "; exit(1); diff --git a/dselect/methods/disk/setup b/dselect/methods/disk/setup index f05481152..6f0b6635f 100755 --- a/dselect/methods/disk/setup +++ b/dselect/methods/disk/setup @@ -99,14 +99,14 @@ fi while true do echo \ -"In order to make it easy for me to find the relevant files I'd ideally -like to install from a straightforward copy of the Debian distribution. -To use this I'll need to know where the top level of that copy of the -distribution is (eg. 'debian/dists/stable') - this directory usually +"In order to make it easy to find the relevant files, it is preferred +to install from a straightforward copy of the Debian distribution. +To use this, it is required to know where the top level of that copy of +the distribution is (eg. 'debian/dists/stable') - this directory usually contains the Packages-Master file. If you do not have a straightforward copy of the distribution available -just answer 'none' and we'll go through the parts I need individually." +just answer 'none' and each needed part will be prompted individually." defhierbase=none # maybe ask for debian/dists and then show and ask for available dists # eg. {stable,frozen,unstable,bo,hamm,slink} @@ -246,7 +246,7 @@ Say 'none' if this area is not available." while [ -z "$this_packages" ] do echo -n " -I can't find the $1 'Packages' file. The information in the +Cannot find the $1 'Packages' file. The information in the 'Packages' file is important for package selection during new installations, and is very useful for upgrades. @@ -254,8 +254,8 @@ If you overlooked it when downloading you should do get it now and return to this installation procedure when you have done so: you will find one Packages file and one Packages.gz file -- either will do -- in the 'binary-$iarch' subdirectory of each area on the FTP sites and -CD-ROMs. Alternatively (and this will be rather slow) I can scan the -packages in the distribution area - say 'scan' if you want me to do so. +CD-ROMs. Alternatively (and this will be rather slow) the packages in +the distribution area can be scanned - say 'scan' if you want to do so. You need a separate Packages file from each of the distribution areas you wish to install. diff --git a/dselect/methods/multicd/install b/dselect/methods/multicd/install index f1e2f6320..539c074eb 100755 --- a/dselect/methods/multicd/install +++ b/dselect/methods/multicd/install @@ -146,15 +146,15 @@ Please change the discs and press <RETURN>. if (!length($invoke)) { warn " -Oh dear, I need to install or upgrade $package, but I don'\''t see -the appropriate file(s) anywhere. I'\''m expecting version $version or -later, as that is listed in the Packages.cd file. +Cannot find the appropriate file(s) anywhere needed to install or upgrade +package $package. Expecting version $version or later, as listed in the +Packages file. -Perhaps you downloaded it with an unexpected name, or something. -In any case, you must find the file(s) and then either place it with -the correct filename(s) (as listed in the Packages.cd file or in -/var/lib/dpkg/available) and rerun the installation, or upgrade the -package by using '\''dpkg --install --auto-deconfigure'\'' by hand. +Perhaps the package was downloaded with an unexpected name? In any case, +you must find the file(s) and then either place it with the correct +filename(s) (as listed in the Packages file or in $vardir/available) +and rerun the installation, or upgrade the package by using +\"dpkg --install --auto-deconfigure" by hand. "; exit(1); @@ -240,7 +240,7 @@ done while ($disk ne $need) { print "Wrong disc. This is disc\n $disk\n"; - print "However, I need disc\n $need\n"; + print "However, the needed disc is\n $need\n"; print "Please change the discs and press <RETURN>\n"; system($umount); <STDIN>; @@ -270,7 +270,7 @@ done chdir ".."; if ($?) { - print "\nThe dpkg run produced errors. Please tell me, if I should\n", + print "\nThe dpkg run produced errors. Please state whether to\n", "continue with the next CD. [Y/n]: "; $answer = <STDIN>; exit 1 if $answer =~ /^n/i; diff --git a/dselect/methods/multicd/setup b/dselect/methods/multicd/setup index f80a422b1..9c32bda10 100755 --- a/dselect/methods/multicd/setup +++ b/dselect/methods/multicd/setup @@ -194,7 +194,7 @@ then <$tp.m >$tp.d blockdevice="`cat $tp.d`" yesno yes \ - "I see a CD-ROM: $blockdevice, mounted on $mountpoint. Is it the right one ?" + "Found a CD-ROM: $blockdevice, mounted on $mountpoint. Is it the right one?" if [ $yesno = no ] then echo 'Unmounting it ...' @@ -218,7 +218,7 @@ then if [ -b /dev/cdrom ] then echo \ - 'I see that /dev/cdrom exists and is a block device.' + 'Found that /dev/cdrom exists and is a block device.' newdefaultdevice=/dev/cdrom fi getblockdev 'Insert the CD-ROM and enter the block device name' @@ -254,21 +254,21 @@ do if [ $option = multi_cd ] then echo \ -"I would like to know where on the CD-ROM the top level of the Debian +"Need to know where on the CD-ROM the top level of the Debian distribution is - this will usually contain the 'dists' directory. If the CD-ROM is badly organized and doesn't have a straightforward copy of -the distribution you may answer 'none' and we'll go through the parts -I need individually." +the distribution you may answer 'none' and the needed parts will be prompted +individually." else echo \ -"In order to make it easy for me to find the relevant files I'd ideally -like to install from a straightforward copy of the Debian distribution. -To use this I'll need to know where the top level of that copy of the +"In order to make it easy to find the relevant files, it is preferred +to install from a straightforward copy of the Debian distribution. +To use this, it is required to know where the top level of that copy of the distribution is - this directory usually contains the Packages-Master file. If you do not have a straightforward copy of the distribution available -just answer 'none' and we'll go through the parts I need individually." +just answer 'none' and the needed parts will be prompted individually." fi defhierbase=none @@ -281,7 +281,7 @@ just answer 'none' and we'll go through the parts I need individually." echo " Last time you said '$p_hierbase', but that doesn't look plausible, since '$p_hierbase/dists/$dist/main/binary-$iarch' doesn't seem to exist. -And I can't get the impression that you're using a multi-CD set." +And it does not appear that you're using a multi-CD set." fi fi @@ -460,7 +460,7 @@ Say 'none' if this area is not available." while [ -z "$this_packages" ] do echo -n " -I can't find the $1 'Packages.cd' file. The information in the +Cannot find the $1 'Packages.cd' file. The information in the 'Packages.cd' file is important for package selection during new installations, and is very useful for upgrades. @@ -468,8 +468,8 @@ If you overlooked it when downloading you should do get it now and return to this installation procedure when you have done so: you will find one Packages.cd file and one Packages.cd.gz file -- either will do -- in the 'binary' subdirectory of each area on the FTP sites and -CD-ROMs. Alternatively (and this will be rather slow) I can scan the -packages in the distribution area - say 'scan' if you want me to do so. +CD-ROMs. Alternatively (and this will be rather slow) the packages in +the distribution area can be scanned - say 'scan' if you want to do so. You need a separate Packages.cd file from each of the distribution areas you wish to install. diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c index 5fbdd8ffa..041ccb0d4 100644 --- a/lib/dpkg/parse.c +++ b/lib/dpkg/parse.c @@ -874,7 +874,7 @@ parsedb(const char *filename, enum parsedbflags flags, struct pkginfo **pkgp) * It is likely that the backward pointer for the package in question * (‘depended’) will be updated by this routine, but this will happen by * the routine traversing the dependency data structures. It doesn't need - * to be told where to update that; I just mention it as something that + * to be told where to update that; just mentioned here as something that * one should be cautious about. */ void copy_dependency_links(struct pkginfo *pkg, diff --git a/src/archives.c b/src/archives.c index 1f2c9df5d..b147281e8 100644 --- a/src/archives.c +++ b/src/archives.c @@ -751,7 +751,7 @@ tarobject(struct tar_archive *tar, struct tar_entry *ti) if (statr) { /* The lstat failed. */ if (errno != ENOENT && errno != ENOTDIR) - ohshite(_("unable to stat '%.255s' (which I was about to install)"), + ohshite(_("unable to stat '%.255s' (which was about to be installed)"), ti->name); /* OK, so it doesn't exist. * However, it's possible that we were in the middle of some other -- Dpkg.Org's dpkg
