From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: Aw: Re:  [PATCH] Fix hardcoded strings in pppsetup.cgi
Date: Thu, 04 Jun 2015 18:23:07 +0200
Message-ID: <1433434987.25208.19.camel@ipfire.org>
In-Reply-To: <op.xzmfnanpcahio0@honk.fritz.box>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6844076233693128214=="
List-Id: <development.lists.ipfire.org>

--===============6844076233693128214==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

On Tue, 2015-06-02 at 23:07 +0200, Larsen wrote:
> On Tue, 02 Jun 2015 23:05:10 +0200, Larsen <larsen007(a)web.de> wrote:
>=20
> > On Tue, 02 Jun 2015 22:01:18 +0200, Michael Tremer <michael.tremer(a)ipfi=
re.org> wrote:
> >
> >> Hi,
> >>
> >> this patch looks okay, but it won't apply. Git error:
> >>
> >> Applying: Aw: Re: [PATCH] Fix hardcoded strings in pppsetup.cgi
> >> error: patch failed: html/cgi-bin/pppsetup.cgi:793
> >> error: html/cgi-bin/pppsetup.cgi: patch does not apply
> >> error: patch failed: langs/de/cgi-bin/de.pl:1822
> >> error: langs/de/cgi-bin/de.pl: patch does not apply
> >> error: patch failed: langs/en/cgi-bin/en.pl:1852
> >> error: langs/en/cgi-bin/en.pl: patch does not apply
> >> Patch failed at 0001 Aw: Re: [PATCH] Fix hardcoded strings in pppsetup.c=
gi
> >>
> >> This is probably caused by copy-and-paste and replacing tabs by spaces
> >> or similar.
> >
>=20
> (now again without hitting Ctrl+Enter too early... damn)
>=20
> I saved the patch from your last reply and compared it to the original patc=
h file
> that was created by TortoiseGit. There were no differences.
>=20
> I also patched pppsetup.cgi in my VM with Core 90 (didn=C2=B4t try for the =
lang files)
> and this also went fine.
>=20
> There are no tabs in the patch.
>=20
> I don=C2=B4t know what could be wrong with it... =3D(

I think I found it. I do not really know where this is coming from
though.

If I remove the first space from every line of the diff that does not
start with a + or - character. Any idea how this comes?

Also merged.

-Michael

--===============6844076233693128214==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC
Q2dBR0JRSlZjSHR1QUFvSkVJQjU4UDl2a0FrSE5XY1FBSU9tYkpiYnVMK1VSbnFvMi9YcE52WUIK
YkhPeDhNTmpuYVVoamw3MjRCcE94V0NIUFo4K1dNMXlyVTJEMVUxeGxlc2dFMHZxbUhPSHFpczM1
OTFueU1hdgo4bHdMSHo5Y09oVFZOdTNWTFQxV3BZckxOOFY5emRUazVEelJkeWZadURhbWMwQ09U
TUxwQ1BBaS9xOGJvYjBaCklLWUdzdXVsVkMyY252ZFkrYm9ncUtLbWI4eVJsa2pUeS8zbHBPejY5
NTh6V09idUkvRHpibHlhUnQzMTVIY2UKb0s3eEUyc3JQK3lNcEs3Z0d0VU5YZzlkcFdiTVhJWTRS
L1NaWVNydGx4N053enVyYkRXWElib09GWjFTM1FicwpEaHFaYlFveXZMZVdlbGxJN3h4dThBZUFp
eE1OT2JQZWNpMjVGYzdoZjU0RnNnUk82TE55Y2NyeHN5bWtGMzdZCmJBREExMERvS0dBKzU0bGNz
VHcxM2x1TUhJRFJobjZGS1BMWS9yeHhrSGtXUXk2bUgyaERUVmZWMDk1aXVrZWYKSVZiaExyMll6
UE5iZDkvTnZjSlZaV0RLeEJickJvQUErV2oxdEN4eHUxR1p4MzY4S1owVmowRDZJRTB1a3lXTgow
QkR5b2JHQnJTVUd4M2lDakpoSmtMOGwyVVVmbTVmMG9ST05adGc1dWJ5aWZoNDdIVm5RYWJxRlVy
WGVmN2JLCmtOOGMyb2pTdjZHeGV3QlFBREFUUlRhOHNYQ3pBcU5COWd1VUE0MWxKVU82TkJSYkpC
WWt2VVgwbnVjOEg1UVYKcExQZXUvWlVFbWdRZnhmZmxHUFNDSlRpaElBVHBieE9XNHlFNzdPUVVx
bHZrYlRjbmZaMDhVd0NCRzIrTmIwdQpQcWlCSU1tYkt6ckJNdk5veGFSMgo9ZW9HSQotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============6844076233693128214==--