From: Michael Tremer <michael.tremer@ipfire.org>
To: ddns@lists.ipfire.org
Subject: Re: [PATCH] add new provider it's DNS (https://www.itsdns.de)
Date: Mon, 27 May 2019 16:29:15 +0100 [thread overview]
Message-ID: <94B41211-2B18-4581-84D0-A1275F8E08B4@ipfire.org> (raw)
In-Reply-To: <796272ba-63d2-d31e-5bcc-340b0b9e3ccc@stalhut.de>
[-- Attachment #1: Type: text/plain, Size: 4502 bytes --]
Hello Jan,
This one time I will accept the file :)
The downside of files is that you cannot have inline comments in them which makes the conversation around the patch a bit more difficult.
However, this is merged now. I have tagged a new release of ddns and integrated that into the next tree of IPFire:
https://git.ipfire.org/?p=ddns.git;a=commitdiff;h=327095f0ea7f80b782664dbc9cb0fce68c7e19cd
This will eventually become Core Update 133 and I would suppose that this will be available in around 6 weeks. We don’t even have 132 out, yet.
Hope this is okay.
Best,
-Michael
> On 26 May 2019, at 22:01, Jan Stalhut <jan(a)stalhut.de> wrote:
>
> Hi Michael,
>
> thank you for the fast feedback. Now, you find the patch-file as attachment of this email. I hope this works now.
>
> Can you say something on how long it will take to make these changes into an ipfire release?
>
> Best regards,
> Jan
>
>
> Am 26.05.19 um 11:30 schrieb Michael Tremer:
>> Hello Jan,
>> Thank you for submitting your patch. It looks good to me.
>> But unfortunately I wasn’t able to merge it.
>> I suppose that your email client replaced all tabs with spaces or something:
>> [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
>> Could you check that and send again?
>> Best,
>> -Michael
>>> On 25 May 2019, at 22:48, Jan Stalhut <jan(a)stalhut.de> 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 = "itsdns.de"
>>> + name = "it's DNS"
>>> + website = "http://www.itsdns.de/"
>>> + protocols = ("ipv6", "ipv4")
>>> +
>>> + # Information about the format of the HTTP request is to be
>>> + # found here: https://www.itsdns.de/dynupdatehelp.htm
>>> +
>>> + url = "https://www.itsdns.de/update.php”
>>>
>> And you could add another empty line here, because we usually have two empty lines after a class.
>>> class DDNSProviderJoker(DDNSProtocolDynDNS2, DDNSProvider):
>>> handle = "joker.com"
>>> --
>>> 2.17.1
>>> _______________________________________________
>>> ddns mailing list
>>> ddns(a)lists.ipfire.org
>>> https://lists.ipfire.org/mailman/listinfo/ddns
>
>
> Mit freundlichen Grüßen
> Jan Stalhut
>
> --
> Jan Stalhut
> Rostocker Str. 21
> 27211 Bassum
>
> Tel. 04241 8208797
> Mobil 0171 5380915
>
> Facebook -> http://facebook.com/jan.stalhut
> <0001-add-new-provider-it-s-DNS-https-www.itsdns.de.patch>
next prev parent reply other threads:[~2019-05-27 15:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-25 21:48 Jan Stalhut
2019-05-26 9:30 ` Michael Tremer
2019-05-26 21:01 ` Jan Stalhut
2019-05-27 15:29 ` Michael Tremer [this message]
2019-07-03 11:33 ` Jan Stalhut
2019-07-04 18:35 ` Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=94B41211-2B18-4581-84D0-A1275F8E08B4@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=ddns@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox