← Back to team overview

svn team mailing list archive

Re: Preparing to merge with upcoming Subversion 1.6.12dfsg-1 from Debian testing

 

On 30/06/10 15:53, Michael Diers wrote:
> On 2010-06-30 15:47, Max Bowsher wrote:
>> On 30/06/10 13:33, Michael Diers wrote:
>>> On 2010-06-30 10:53, Max Bowsher wrote:
>>>> On 25/06/10 18:23, Michael Diers wrote:
>>>>> On 2010-06-25 16:55, Michael Diers wrote:
>>>>> [...]
>>>>>> Before merging into lp:~svn/ubuntu/lucid/subversion/ppa, there is one
>>>>>> merge mistake from the previous sync that I'd like to fix: I managed to
>>>>>> lose the kwallet configuration switch for karmic and jaunty.
>>>>>
>>>>> Oh, and hardy, too.
>>>>
>>>> What do you mean, lose it?
>>>>
>>>> It was intentionally removed in 1.6.6dfsg-1ubuntu0maxb1, did you want to
>>>> put it back?
>>>
>>> Yes, I'd like to put it back. It's already back in lucid; I managed to
>>> not merge it to the older branches, despite my intention to do so.
>>
>> This is not accurate.
>>
>> KWallet integration was first turned on in Lucid (upstream in Ubuntu),
>> so has been on in our PPA packages too.
>>
>> I deliberately turned it off in Karmic and below when backporting that
>> new source, so that people could upgrade the distro's subversion to the
>> PPA's subversion without pulling in extra dependencies.
>>
>> I'm willing to reconsider, but it was a deliberate choice and not in any
>> way an accident of merging.
> 
> Max,
> 
> I did not mean to imply a merge mistake on your part in any way.

No problem :-)  That comment of mine was actually referring to when you
said "there is one merge mistake from the previous sync that I'd like to
fix: I managed to lose the kwallet configuration switch for karmic and
jaunty."

> I think
> I do understand your reasoning for turning off KWallet support in Karmic
> and below.
> 
> However, there are no extra runtime dependencies involved when support
> for GNOME Keyring and KWallet is enabled. The dependency is strictly
> build-time. Subversion will probe for the libraries at runtime; if they
> are not installed -- well, that's fine, too. Subversion will simply
> revert to storing secrets in the user's home directory.

Aha. I didn't realize that there was neither run-time nor
package-install-time dependency involved. That makes things much better.

> So unless we want to deliberately protect users of Karmic and below from
> the change of behaviour that the KWallet integration entails, when the
> required libraries are installed, I don't see the point of explicitly
> disabling it. In fact, I'm very much in favour of enabling it.

It's an issue, but a minor one. I now agree with you that we should turn
it back on (assuming, of course, KDE in all the older distroseries is
new enough for Subversion's needs?)

Max.

Attachment: signature.asc
Description: OpenPGP digital signature


Follow ups

References