From: "Christoph Heiss" <c.heiss@proxmox.com>
To: "Daniel Kral" <d.kral@proxmox.com>
Cc: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: Re: [pve-devel] [PATCH installer 6/6] fix #5811: auto: add option to retrieve FQDN from DHCP configuration
Date: Tue, 01 Apr 2025 15:25:48 +0200 [thread overview]
Message-ID: <D8VC42F4R5VW.23126SXQH3CVG@proxmox.com> (raw)
In-Reply-To: <bf26e451-0771-49c3-9ea7-2064c0a9835b@proxmox.com>
Thanks for testing!
On Tue Apr 1, 2025 at 3:15 PM CEST, Daniel Kral wrote:
[..]
> Just tried to apply this, and it seems like the diff for the JSON files
> is malformed as it splits the changes at roughly 1000 characters for the
> changes to run-env*.json files:
>
> * run-env-info.json
> * no_fqdn_from_dhcp.run-env.json
> * fqdn_from_dhcp_no_default_domain.run-env.json
Right, thanks for noticing! That definitely is broken, unfortunately.
Probably a hard-limit somewhere with 1000 characters per line along the
line.
The file directly from `git format-patch` looks fine, with no extra
newlines. Sent the patches using `git send-email` as usual, so not sure
where it went wrong.
I'll see if I can reproduce it locally for me and fix it up for a v2.
(Otherwise I'll just pretty-print/format these JSON files for v2.)
>
> I'm not sure what could have caused this, but after manually fixing
> this, the rest of the patch applies cleanly and the tests run fine.
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
next prev parent reply other threads:[~2025-04-01 13:26 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-27 15:17 [pve-devel] [PATCH installer 0/6] fix #5811: " Christoph Heiss
2025-03-27 15:17 ` [pve-devel] [PATCH installer 1/6] auto: utils: avoid a force unwrap() Christoph Heiss
2025-04-04 12:51 ` [pve-devel] applied: " Thomas Lamprecht
2025-03-27 15:17 ` [pve-devel] [PATCH installer 2/6] auto: tests: parse-answer: allow per-test runtime env Christoph Heiss
2025-04-04 12:51 ` [pve-devel] applied: " Thomas Lamprecht
2025-03-27 15:17 ` [pve-devel] [PATCH installer 3/6] auto: tests: allow testing for serde parse errors of answer files Christoph Heiss
2025-04-04 12:51 ` [pve-devel] applied: " Thomas Lamprecht
2025-03-27 15:17 ` [pve-devel] [PATCH installer 4/6] tui, common: move network option tests to correct crate Christoph Heiss
2025-04-04 12:54 ` Thomas Lamprecht
2025-03-27 15:17 ` [pve-devel] [PATCH installer 5/6] common: options: allow user-supplied domain for network options Christoph Heiss
2025-03-27 15:17 ` [pve-devel] [PATCH installer 6/6] fix #5811: auto: add option to retrieve FQDN from DHCP configuration Christoph Heiss
2025-04-01 13:15 ` Daniel Kral
2025-04-01 13:25 ` Christoph Heiss [this message]
2025-04-01 13:29 ` Stefan Hanreich
2025-04-01 13:44 ` Daniel Kral
2025-04-01 14:58 ` Thomas Lamprecht
2025-04-01 13:45 ` [pve-devel] [PATCH installer 0/6] fix #5811: " Daniel Kral
2025-04-01 14:05 ` Christoph Heiss
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=D8VC42F4R5VW.23126SXQH3CVG@proxmox.com \
--to=c.heiss@proxmox.com \
--cc=d.kral@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.