From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Stalhut To: ddns@lists.ipfire.org Subject: Re: [PATCH] add new provider it's DNS (https://www.itsdns.de) Date: Sun, 26 May 2019 23:01:28 +0200 Message-ID: <796272ba-63d2-d31e-5bcc-340b0b9e3ccc@stalhut.de> In-Reply-To: <90D15E55-658A-480D-8284-0DDF581B131A@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0543785215439555911==" List-Id: --===============0543785215439555911== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Michael, thank you for the fast feedback. Now, you find the patch-file as=20 attachment of this email. I hope this works now. Can you say something on how long it will take to make these changes=20 into an ipfire release? Best regards, Jan Am 26.05.19 um 11:30 schrieb Michael Tremer: > Hello Jan, >=20 > Thank you for submitting your patch. It looks good to me. >=20 > But unfortunately I wasn=E2=80=99t able to merge it. >=20 > I suppose that your email client replaced all tabs with spaces or something: >=20 > [root(a)ipfire ddns]# pwclient git-am -p ddns -s 2265 > Applying patch #2265 using "git am -s" > Description: add new provider it's DNS (https://www.itsdns.de) > Applying: add new provider it's DNS (https://www.itsdns.de) > error: patch failed: README:67 > error: README: patch does not apply > error: patch failed: src/ddns/providers.py:1108 > error: src/ddns/providers.py: patch does not apply > Patch failed at 0001 add new provider it's DNS (https://www.itsdns.de) > The copy of the patch that failed is found in: .git/rebase-apply/patch > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > 'git am' failed with exit status 128 > [root(a)ipfire ddns]# git apply -3 .git/rebase-apply/patch > error: patch failed: README:67 > Falling back to three-way merge... > error: patch failed: README:67 > error: README: patch does not apply > error: patch failed: src/ddns/providers.py:1108 > Falling back to three-way merge... > error: patch failed: src/ddns/providers.py:1108 > error: src/ddns/providers.py: patch does not apply >=20 > Could you check that and send again? >=20 > Best, > -Michael >=20 >> On 25 May 2019, at 22:48, Jan Stalhut wrote: >> >> --- >> README | 1 + >> src/ddns/providers.py | 10 ++++++++++ >> 2 files changed, 11 insertions(+) >> >> diff --git a/README b/README >> index d170858..1c5ffd6 100644 >> --- a/README >> +++ b/README >> @@ -67,6 +67,7 @@ SUPPORTED PROVIDERS: >> enom.com >> entrydns.net >> freedns.afraid.org >> + itsdns.de >> joker.com >> loopia.se >> myonlineportal.net >> diff --git a/src/ddns/providers.py b/src/ddns/providers.py >> index ea723e5..a9a0b03 100644 >> --- a/src/ddns/providers.py >> +++ b/src/ddns/providers.py >> @@ -1108,6 +1108,16 @@ class DDNSProviderFreeDNSAfraidOrg(DDNSProvider): >> # If we got here, some other update error happened. >> raise DDNSUpdateError >> >> +class DDNSProviderItsdns(DDNSProtocolDynDNS2, DDNSProvider): >> + handle =3D "itsdns.de" >> + name =3D "it's DNS" >> + website =3D "http://www.itsdns.de/" >> + protocols =3D ("ipv6", "ipv4") >> + >> + # Information about the format of the HTTP request is to be >> + # found here: https://www.itsdns.de/dynupdatehelp.htm >> + >> + url =3D "https://www.itsdns.de/update.php=E2=80=9D >> >=20 > And you could add another empty line here, because we usually have two empt= y lines after a class. >=20 >> class DDNSProviderJoker(DDNSProtocolDynDNS2, DDNSProvider): >> handle =3D "joker.com" >> --=20 >> 2.17.1 >> _______________________________________________ >> ddns mailing list >> ddns(a)lists.ipfire.org >> https://lists.ipfire.org/mailman/listinfo/ddns >=20 Mit freundlichen Gr=C3=BC=C3=9Fen Jan Stalhut --=20 Jan Stalhut Rostocker Str. 21 27211 Bassum Tel. 04241 8208797 Mobil 0171 5380915 Facebook -> http://facebook.com/jan.stalhut --===============0543785215439555911== Content-Type: text/x-patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-add-new-provider-it-s-DNS-https-www.itsdns.de.patch" MIME-Version: 1.0 PkZyb20gZmNkZTIwZGY0MmM3ZjllZTM2Y2FmNTIxNWJiYTFiOWI5OGFhMjc1ZiBNb24gU2VwIDE3 IDAwOjAwOjAwIDIwMDEKRnJvbTogSmFuIFN0YWxodXQgPGphbkBzdGFsaHV0LmRlPgpEYXRlOiBT YXQsIDI1IE1heSAyMDE5IDIzOjM3OjM1ICswMjAwClN1YmplY3Q6IFtQQVRDSF0gYWRkIG5ldyBw cm92aWRlciBpdCdzIEROUyAoaHR0cHM6Ly93d3cuaXRzZG5zLmRlKQoKLS0tCiBSRUFETUUgICAg ICAgICAgICAgICAgfCAgMSArCiBzcmMvZGRucy9wcm92aWRlcnMucHkgfCAxMCArKysrKysrKysr CiAyIGZpbGVzIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9SRUFETUUg Yi9SRUFETUUKaW5kZXggZDE3MDg1OC4uMWM1ZmZkNiAxMDA2NDQKLS0tIGEvUkVBRE1FCisrKyBi L1JFQURNRQpAQCAtNjcsNiArNjcsNyBAQCBTVVBQT1JURUQgUFJPVklERVJTOgogCWVub20uY29t CiAJZW50cnlkbnMubmV0CiAJZnJlZWRucy5hZnJhaWQub3JnCisJaXRzZG5zLmRlCiAJam9rZXIu Y29tCiAJbG9vcGlhLnNlCiAJbXlvbmxpbmVwb3J0YWwubmV0CmRpZmYgLS1naXQgYS9zcmMvZGRu cy9wcm92aWRlcnMucHkgYi9zcmMvZGRucy9wcm92aWRlcnMucHkKaW5kZXggZWE3MjNlNS4uYTlh MGIwMyAxMDA2NDQKLS0tIGEvc3JjL2RkbnMvcHJvdmlkZXJzLnB5CisrKyBiL3NyYy9kZG5zL3By b3ZpZGVycy5weQpAQCAtMTEwOCw2ICsxMTA4LDE2IEBAIGNsYXNzIERETlNQcm92aWRlckZyZWVE TlNBZnJhaWRPcmcoREROU1Byb3ZpZGVyKToKIAkJIyBJZiB3ZSBnb3QgaGVyZSwgc29tZSBvdGhl ciB1cGRhdGUgZXJyb3IgaGFwcGVuZWQuCiAJCXJhaXNlIERETlNVcGRhdGVFcnJvcgogCitjbGFz cyBERE5TUHJvdmlkZXJJdHNkbnMoREROU1Byb3RvY29sRHluRE5TMiwgREROU1Byb3ZpZGVyKToK KyAgICAgICAgaGFuZGxlICAgID0gIml0c2Rucy5kZSIKKyAgICAgICAgbmFtZSAgICAgID0gIml0 J3MgRE5TIgorICAgICAgICB3ZWJzaXRlICAgPSAiaHR0cDovL3d3dy5pdHNkbnMuZGUvIgorICAg ICAgICBwcm90b2NvbHMgPSAoImlwdjYiLCAiaXB2NCIpCisKKyAgICAgICAgIyBJbmZvcm1hdGlv biBhYm91dCB0aGUgZm9ybWF0IG9mIHRoZSBIVFRQIHJlcXVlc3QgaXMgdG8gYmUgZm91bmQKKyAg ICAgICAgIyBoZXJlOiBodHRwczovL3d3dy5pdHNkbnMuZGUvZHludXBkYXRlaGVscC5odG0KKwor ICAgICAgICB1cmwgPSAiaHR0cHM6Ly93d3cuaXRzZG5zLmRlL3VwZGF0ZS5waHAiCiAKIGNsYXNz IERETlNQcm92aWRlckpva2VyKERETlNQcm90b2NvbER5bkROUzIsIERETlNQcm92aWRlcik6CiAJ CWhhbmRsZSAgPSAiam9rZXIuY29tIgotLSAKMi4xNy4xCgo= --===============0543785215439555911==--