Openwall GNU/*/Linux - a small security-enhanced Linux distro for servers
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Sat, 4 May 2013 12:58:29 +0200
From: magnum <john.magnum@...hmail.com>
To: john-dev@...ts.openwall.com
Subject: Re: Some typos

On 4 May, 2013, at 7:14 , Alexander Cherepanov <cherepan@...me.ru> wrote:
> On 2013-05-01 15:46, magnum wrote:
>> On 1 May, 2013, at 9:22 , Alexander Cherepanov<cherepan@...me.ru>  wrote:
>>> On 2013-05-01 00:17, magnum wrote:
>>>>> Attached patch fixes some typos in unstable.
>>>>> 
>>>>> --
>>>>> Alexander Cherepanov
>>>>> <unstable-typos.patch>
>>>> 
>>>> Thanks, committed.
>>> 
>>> run/dynamic.conf seems to be missed while patching. Attaching remaining patch.
>> 
>> I blame git for weird behaviour. Fixed.
> 
> I get such an effect when I do 'patch -p2' in src/ dir.

Yes but that emits this, which is hard to miss:

can't find file to patch at input line 7
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Fix some typos.
|
|diff --git a/run/dynamic.conf b/run/dynamic.conf
|index 7ee8f5c..1e8dfe3 100644
|--- a/run/dynamic.conf
|+++ b/run/dynamic.conf
--------------------------
File to patch: 


Doing "git apply" of same patch in src/ dir does not even warn. It silently skips dynamic.conf. I really think it should warn.

magnum

Powered by blists - more mailing lists

Your e-mail address:

Powered by Openwall GNU/*/Linux - Powered by OpenVZ