Hello Adolf,
On 24 Jan 2022, at 11:28, Adolf Belka adolf.belka@ipfire.org wrote:
Hi Michael,
On 24/01/2022 12:13, Michael Tremer wrote:
Hello Adolf, You can just revert this commit in your local branch. That is probably easiest.
The commit is not in my local branch. Whenever I do an update I always do it in a branch which is based on the current status of next. So as next does not yet have that patch merged from the temp-cu164 branch of Peter, then it is also not in my python3.10 branch. Maybe I am not using the git branches the way I should be but that is what I have been doing to date.
Then I do not understand :)
Are you trying to rebase your Python 3.10 branch on next?
-Michael
Regards, Adolf.
-Michael
On 24 Jan 2022, at 09:46, Adolf Belka adolf.belka@ipfire.org wrote:
Hi Peter,
I saw that you merged I patch I did some time ago for the update of pythons-setuptools from version 56.2.0 to 58.0.4
I have been working on the python3 upgrade from 3.8 to 3.10 and with this I am also updating the various python modules that are out of date.
I had forgotten that I had done that patch so my python3 series build is also updating python3-setuptools from 56.2.0 to 59.5.0
I would appreciate it if you could revert my patch https://git.ipfire.org/?p=people/pmueller/ipfire-2.x.git;a=commit;h=c2539fe2... otherwise I will need to start all over again for the third time with my python3 branch build.
Thanks very much and regards,
Adolf.