[opensuse-packaging] factory_auto declines package with commented out patch
Hi, It seems factory_auto declines packages where a patch needing to be rebased is commented out from the sources entirely, yet this is the only way to avoid applying the patch when using `%autosetup`. See, for example, sr#773323 which has Patch12 marked as 'NEEDS-REBASE' and commented out. It has been duly declined. Is there any way, short of doing away with `%autosetup`, to get this through factory_auto? Thanks for any advice. [1] https://build.opensuse.org/request/show/773323 -- Atri Bhattacharya -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org
Am Dienstag, 18. Februar 2020, 18:36:09 CET schrieb Atri Bhattacharya:
Hi, It seems factory_auto declines packages where a patch needing to be rebased is commented out from the sources entirely, yet this is the only way to avoid applying the patch when using `%autosetup`. See, for example, sr#773323 which has Patch12 marked as 'NEEDS-REBASE' and commented out. It has been duly declined. Is there any way, short of doing away with `%autosetup`, to get this through factory_auto?
Cannot speak for the factory policy, but what's the problem with rebasing the patch exactly? -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org
On Tue, 2020-02-18 at 20:29 +0100, Hans-Peter Jansen wrote:
Am Dienstag, 18. Februar 2020, 18:36:09 CET schrieb Atri Bhattacharya:
Hi, It seems factory_auto declines packages where a patch needing to be rebased is commented out from the sources entirely, yet this is the only way to avoid applying the patch when using `%autosetup`. See, for example, sr#773323 which has Patch12 marked as 'NEEDS-REBASE' and commented out. It has been duly declined. Is there any way, short of doing away with `%autosetup`, to get this through factory_auto?
Cannot speak for the factory policy, but what's the problem with rebasing the patch exactly?
It is just that it is beyond my ability --- not being all that conversant with Qt's inner workings --- and the rebase doesn't look to me to be straightforward. Cheers -- Atri Bhattacharya -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org
On Tuesday 2020-02-18 20:29, Hans-Peter Jansen wrote:
Am Dienstag, 18. Februar 2020, 18:36:09 CET schrieb Atri Bhattacharya:
Hi, It seems factory_auto declines packages where a patch needing to be rebased is commented out from the sources entirely, yet this is the only way to avoid applying the patch when using `%autosetup`. See, for example, sr#773323 which has Patch12 marked as 'NEEDS-REBASE' and commented out. It has been duly declined. Is there any way, short of doing away with `%autosetup`, to get this through factory_auto?
Cannot speak for the factory policy, but what's the problem with rebasing the patch exactly?
When the patch is commented out, it is not applied. In other words, you could just delete the patch altogether. (It is not lost, as it will remain in the history.) That is what the bot's message means. -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org
On Tue, Feb 18, 2020 at 23:56, Jan Engelhardt
On Tuesday 2020-02-18 20:29, Hans-Peter Jansen wrote:
Am Dienstag, 18. Februar 2020, 18:36:09 CET schrieb Atri Bhattacharya:
Hi, It seems factory_auto declines packages where a patch needing to be rebased is commented out from the sources entirely, yet this is the only way to avoid applying the patch when using `%autosetup`. See, for example, sr#773323 which has Patch12 marked as 'NEEDS-REBASE' and commented out. It has been duly declined. Is there any way, short of doing away with `%autosetup`, to get this through factory_auto?
Cannot speak for the factory policy, but what's the problem with rebasing the patch exactly?
When the patch is commented out, it is not applied. In other words, you could just delete the patch altogether. (It is not lost, as it will remain in the history.)
That is what the bot's message means.
%autosetup macro applies patches without %patch statements, so that's not the correct assumption. Please read https://rpm.org/user_doc/autosetup.html LCP [Stasiek] https://lcp.world -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org
On Tuesday 2020-02-18 23:58, Stasiek Michalski wrote:
for example, sr#773323 which has Patch12 marked as 'NEEDS-REBASE' and
When the patch is commented out, it is not applied. In other words, you could just delete the patch altogether. (It is not lost, as it will remain in the history.)
That is what the bot's message means.
%autosetup macro applies patches without %patch statements, so that's not the correct assumption.
He mentioned "Patch12" being commented out. For me, there is just one way to interpret, and that is a preamble line like #Patch12: xyz.patch not #%patch12 -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org
On Wed, 2020-02-19 at 00:02 +0100, Jan Engelhardt wrote:
On Tuesday 2020-02-18 23:58, Stasiek Michalski wrote:
for example, sr#773323 which has Patch12 marked as 'NEEDS- REBASE' and
When the patch is commented out, it is not applied. In other words, you could just delete the patch altogether. (It is not lost, as it will remain in the history.)
Thanks, this may be what I end up doing, but ideally I would have liked to keep the patch --- albeit commented out --- so that someone who noticed the "PATCH-NEEDS-REBASE" tag would take it upon themselves to fix it.
That is what the bot's message means.
%autosetup macro applies patches without %patch statements, so that's not the correct assumption.
He mentioned "Patch12" being commented out. For me, there is just one way to interpret, and that is a preamble line like
#Patch12: xyz.patch
This is indeed what I have done.
not
#%patch12
Thanks and best wishes. -- Atri Bhattacharya Wed 19 Feb 00:14:05 CET 2020 Sent from openSUSE Tumbleweed on my laptop. -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org
On Wed, 2020-02-19 at 00:02 +0100, Jan Engelhardt wrote:
On Tuesday 2020-02-18 23:58, Stasiek Michalski wrote:
for example, sr#773323 which has Patch12 marked as 'NEEDS- REBASE' and
When the patch is commented out, it is not applied. In other words, you could just delete the patch altogether. (It is not lost, as it will remain in the history.)
That is what the bot's message means.
Thanks, this may be what I end up doing, but ideally I would have liked to keep the patch --- albeit commented out --- so that someone who noticed the "PATCH-NEEDS-REBASE" tag would take it upon themselves to fix it.
%autosetup macro applies patches without %patch statements, so that's not the correct assumption.
He mentioned "Patch12" being commented out. For me, there is just one way to interpret, and that is a preamble line like
#Patch12: xyz.patch
This is what I have done.
not
#%patch12
Thanks everyone. -- Atri Bhattacharya -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org
Am 18.02.20 um 23:56 schrieb Jan Engelhardt:
When the patch is commented out, it is not applied. In other words, you could just delete the patch altogether. (It is not lost, as it will remain in the history.)
In theory, yes. But how will you (easily, reliably) get it back? The easiest way I can think of is "download an old source rpm from $SOMEWHERE and extract it from that". the osc "version control" joke of a system has just failed too often on me as that I would even consider trying to get an old version consistently out of it. -- Stefan Seyfried "For a successful technology, reality must take precedence over public relations, for nature cannot be fooled." -- Richard Feynman -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org
On Wednesday 2020-02-19 10:13, Stefan Seyfried wrote:
Am 18.02.20 um 23:56 schrieb Jan Engelhardt:
When the patch is commented out, it is not applied. In other words, you could just delete the patch altogether. (It is not lost, as it will remain in the history.)
In theory, yes. But how will you (easily, reliably) get it back?
osc up -r123 cp x.patch /tmp osc up (-r987) mv /tmp/x.patch .
the osc "version control" joke of a system has just failed too often on me as that I would even consider trying to get an old version consistently out of it.
*giggle* -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org
On Feb 19 2020, Jan Engelhardt wrote:
On Wednesday 2020-02-19 10:13, Stefan Seyfried wrote:
Am 18.02.20 um 23:56 schrieb Jan Engelhardt:
When the patch is commented out, it is not applied. In other words, you could just delete the patch altogether. (It is not lost, as it will remain in the history.)
In theory, yes. But how will you (easily, reliably) get it back?
osc up -r123
osc cat -u -r REV PRJ PKG FILE Andreas. -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different." -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org
Am 19.02.20 um 10:15 schrieb Jan Engelhardt:
On Wednesday 2020-02-19 10:13, Stefan Seyfried wrote:
Am 18.02.20 um 23:56 schrieb Jan Engelhardt:
When the patch is commented out, it is not applied. In other words, you could just delete the patch altogether. (It is not lost, as it will remain in the history.)
In theory, yes. But how will you (easily, reliably) get it back?
osc up -r123
And here it usually ended for me with something like (from memory) "cannot apply patch" or similar.
cp x.patch /tmp osc up (-r987) mv /tmp/x.patch .
the osc "version control" joke of a system has just failed too often on me as that I would even consider trying to get an old version consistently out of it.
*giggle*
It is funny, but only if you do not want to bisect to find that old qemu-kvm version that did not contain the new bug... -- Stefan Seyfried "For a successful technology, reality must take precedence over public relations, for nature cannot be fooled." -- Richard Feynman -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org
On Wednesday, 19 February 2020 10:13 Stefan Seyfried wrote:
Am 18.02.20 um 23:56 schrieb Jan Engelhardt:
When the patch is commented out, it is not applied. In other words, you could just delete the patch altogether. (It is not lost, as it will remain in the history.)
In theory, yes. But how will you (easily, reliably) get it back? The easiest way I can think of is "download an old source rpm from $SOMEWHERE and extract it from that".
the osc "version control" joke of a system has just failed too often on me as that I would even consider trying to get an old version consistently out of it.
Growing number of packages works around this (and other problems) by tracking the package source (contents of the OBS package source without the tarball) in git and only exporting it into OBS. Some go even further, track the original source and only export the tarball, specfile and changelog. Personally I see it as a strong hint that something is not right (to put it mildly). Your suggestion to trick the script by marking the patch as SourceNN instead of PatchNN may be even stronger hint. Michal Kubecek -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org
Am 18.02.20 um 18:36 schrieb Atri Bhattacharya:
Hi, It seems factory_auto declines packages where a patch needing to be rebased is commented out from the sources entirely, yet this is the only way to avoid applying the patch when using `%autosetup`. See, for example, sr#773323 which has Patch12 marked as 'NEEDS-REBASE' and commented out. It has been duly declined. Is there any way, short of doing away with `%autosetup`, to get this through factory_auto?
Thanks for any advice.
try declaring the patch as Source99: Then %autosetup will probably ignore it, and it'still not an orphaned file for factory_auto. HTH, seife -- Stefan Seyfried "For a successful technology, reality must take precedence over public relations, for nature cannot be fooled." -- Richard Feynman -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org
participants (7)
-
Andreas Schwab
-
Atri Bhattacharya
-
Hans-Peter Jansen
-
Jan Engelhardt
-
Michal Kubecek
-
Stasiek Michalski
-
Stefan Seyfried