unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
* bug#19402: Already-applied patches in 'origin' are automatically reversed
@ 2014-12-18  0:01 Mark H Weaver
  2014-12-18 11:05 ` Ludovic Courtès
  0 siblings, 1 reply; 5+ messages in thread
From: Mark H Weaver @ 2014-12-18  0:01 UTC (permalink / raw)
  To: 19402

Currently, if a patch that we carry in Guix is taken upstream, and then
we update the package, Guix will automatically reverse the patch without
error.

This behavior delayed my xorg-update work for several hours today (I was
stumped and took a break), and I worry that patches that aren't needed
for successful compilation (e.g. security fixes) could be automatically
undone without anyone noticing.

Perhaps the solution is to pass --force (not --batch) to 'patch'.

What do you think?

      Mark

^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#19402: Already-applied patches in 'origin' are automatically reversed
  2014-12-18  0:01 bug#19402: Already-applied patches in 'origin' are automatically reversed Mark H Weaver
@ 2014-12-18 11:05 ` Ludovic Courtès
  2014-12-26 23:21   ` Ludovic Courtès
  0 siblings, 1 reply; 5+ messages in thread
From: Ludovic Courtès @ 2014-12-18 11:05 UTC (permalink / raw)
  To: Mark H Weaver; +Cc: 19402

Mark H Weaver <mhw@netris.org> skribis:

> Currently, if a patch that we carry in Guix is taken upstream, and then
> we update the package, Guix will automatically reverse the patch without
> error.
>
> This behavior delayed my xorg-update work for several hours today (I was
> stumped and took a break), and I worry that patches that aren't needed
> for successful compilation (e.g. security fixes) could be automatically
> undone without anyone noticing.
>
> Perhaps the solution is to pass --force (not --batch) to 'patch'.

I’ve re-read patch(1) and yes, definitely.

Would you like to make this change in ‘core-updates’?

Thanks,
Ludo’.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#19402: Already-applied patches in 'origin' are automatically reversed
  2014-12-18 11:05 ` Ludovic Courtès
@ 2014-12-26 23:21   ` Ludovic Courtès
  2014-12-27  1:43     ` Mark H Weaver
  0 siblings, 1 reply; 5+ messages in thread
From: Ludovic Courtès @ 2014-12-26 23:21 UTC (permalink / raw)
  To: Mark H Weaver; +Cc: 19402-done

Done in commit 9426440, thanks!

Ludo’.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#19402: Already-applied patches in 'origin' are automatically reversed
  2014-12-26 23:21   ` Ludovic Courtès
@ 2014-12-27  1:43     ` Mark H Weaver
  2014-12-27 13:14       ` Ludovic Courtès
  0 siblings, 1 reply; 5+ messages in thread
From: Mark H Weaver @ 2014-12-27  1:43 UTC (permalink / raw)
  To: 19402

ludo@gnu.org (Ludovic Courtès) writes:

> Done in commit 9426440, thanks!

Thanks for fixing it!  The new strictness has already borne fruit.
Turns out we've been reverse applying m4-readlink-EINVAL.patch to our m4
since at least 1fa49a2c4 (September 2013).  Fixed in 6ac8aa3d7.

     Mark

^ permalink raw reply	[flat|nested] 5+ messages in thread

* bug#19402: Already-applied patches in 'origin' are automatically reversed
  2014-12-27  1:43     ` Mark H Weaver
@ 2014-12-27 13:14       ` Ludovic Courtès
  0 siblings, 0 replies; 5+ messages in thread
From: Ludovic Courtès @ 2014-12-27 13:14 UTC (permalink / raw)
  To: Mark H Weaver; +Cc: 19402

Mark H Weaver <mhw@netris.org> skribis:

> ludo@gnu.org (Ludovic Courtès) writes:
>
>> Done in commit 9426440, thanks!
>
> Thanks for fixing it!  The new strictness has already borne fruit.
> Turns out we've been reverse applying m4-readlink-EINVAL.patch to our m4
> since at least 1fa49a2c4 (September 2013).  Fixed in 6ac8aa3d7.

Ouch.  Using --force was really a good idea.

Thanks for the quick fix,
Ludo’.

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2014-12-27 13:15 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-18  0:01 bug#19402: Already-applied patches in 'origin' are automatically reversed Mark H Weaver
2014-12-18 11:05 ` Ludovic Courtès
2014-12-26 23:21   ` Ludovic Courtès
2014-12-27  1:43     ` Mark H Weaver
2014-12-27 13:14       ` Ludovic Courtès

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).