dpkg's main repository branch, master, updated. 1.16.1.2-341-g65c28bd
On 2012-03-16 15:07 +0100, Guillem Jover wrote:
> + /* Ignore removal request if the diverted file is still owned
> + * by another package in the same set. */
> + if (diversion_is_shared(pkgset, namenode)) {
> + if (opt_verbose > 0)
> + printf(_("Ignoring removal of shared diversion '%s'.
"),
> + diversion_describe(contest));
> + exit(0);
> + }
The message could use some improvement, I think. As stated in the
comment, it is the _request_ to remove the diversion which is ignored,
but the unsuspecting user might be misled to think "the shared diversion
has been removed, and somehow this fact is ignored".
Cheers,
Sven
--
To UNSUBSCRIBE, email to debian-dpkg-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
Archive: 87ehssfhj8.fsf@turtle.gmx.de">http://lists.debian.org/87ehssfhj8.fsf@turtle.gmx.de
03-16-2012, 07:09 PM
Guillem Jover
dpkg's main repository branch, master, updated. 1.16.1.2-341-g65c28bd
On Fri, 2012-03-16 at 20:54:35 +0100, Sven Joachim wrote:
> On 2012-03-16 15:07 +0100, Guillem Jover wrote:
> > + /* Ignore removal request if the diverted file is still owned
> > + * by another package in the same set. */
> > + if (diversion_is_shared(pkgset, namenode)) {
> > + if (opt_verbose > 0)
> > + printf(_("Ignoring removal of shared diversion '%s'.
"),
> > + diversion_describe(contest));
> > + exit(0);
> > + }
>
> The message could use some improvement, I think. As stated in the
> comment, it is the _request_ to remove the diversion which is ignored,
> but the unsuspecting user might be misled to think "the shared diversion
> has been removed, and somehow this fact is ignored".
Would the following clarify?
"Ignoring removal request of shared diversion '%s'.
"
If so, I'll be including this in the last push I'm about to do today,
before the upload, after I've ironed out a corner-case I stumbled over.
thanks,
guillem
--
To UNSUBSCRIBE, email to debian-dpkg-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
Archive: 20120316200908.GA8301@gaara.hadrons.org">http://lists.debian.org/20120316200908.GA8301@gaara.hadrons.org
03-16-2012, 07:17 PM
Jonathan Nieder
dpkg's main repository branch, master, updated. 1.16.1.2-341-g65c28bd
>>> + if (opt_verbose > 0)
>>> + printf(_("Ignoring removal of shared diversion '%s'.
"),
>>> + diversion_describe(contest));
[...]
> Would the following clarify?
>
> "Ignoring removal request of shared diversion '%s'.
"
Yes, I think so. Micronit: it would sound more natural with s/of/for/.
> If so, I'll be including this in the last push I'm about to do today,
> before the upload, after I've ironed out a corner-case I stumbled over.
Thanks.
Jonathan
--
To UNSUBSCRIBE, email to debian-dpkg-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
Archive: 20120316201733.GD29429@burratino">http://lists.debian.org/20120316201733.GD29429@burratino
03-16-2012, 07:39 PM
Sven Joachim
dpkg's main repository branch, master, updated. 1.16.1.2-341-g65c28bd
On 2012-03-16 21:17 +0100, Jonathan Nieder wrote:
> Guillem Jover wrote:
>>> On 2012-03-16 15:07 +0100, Guillem Jover wrote:
>
>>>> + if (opt_verbose > 0)
>>>> + printf(_("Ignoring removal of shared diversion '%s'.
"),
>>>> + diversion_describe(contest));
> [...]
>> Would the following clarify?
>>
>> "Ignoring removal request of shared diversion '%s'.
"
>
> Yes, I think so. Micronit: it would sound more natural with s/of/for/.
How about "Ignoring request to remove shared diversion '%s'.
" ?
Cheers,
Sven
--
To UNSUBSCRIBE, email to debian-dpkg-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
Archive: 8762e4fffn.fsf@turtle.gmx.de">http://lists.debian.org/8762e4fffn.fsf@turtle.gmx.de
03-17-2012, 12:03 AM
Guillem Jover
dpkg's main repository branch, master, updated. 1.16.1.2-341-g65c28bd
On Fri, 2012-03-16 at 21:09:08 +0100, Guillem Jover wrote:
> Would the following clarify?
>
> "Ignoring removal request of shared diversion '%s'.
"
On Fri, 2012-03-16 at 21:39:56 +0100, Sven Joachim wrote:
> How about "Ignoring request to remove shared diversion '%s'.
" ?
Looks good, queued it, thanks.
> If so, I'll be including this in the last push I'm about to do today,
> before the upload, after I've ironed out a corner-case I stumbled over.
Unfortunately it looks like I'm too exhausted to fix the selections
corner-case properly today, so I hope tomorrow will be the day...
thanks,
guillem
--
To UNSUBSCRIBE, email to debian-dpkg-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
Archive: 20120317010350.GA20702@gaara.hadrons.org">http://lists.debian.org/20120317010350.GA20702@gaara.hadrons.org