From 06a32b319f065550efe0d2a9ff10ca6bdc32b893 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sat, 23 Jul 2022 20:15:18 +0200
Subject: [PATCH] operon: hopefully better fix for flaky mtime tests

copy the mtime after we write everything, so there is no chance of
it changing before we note the initial value.
---
 quodlibet/operon/commands.py | 8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/quodlibet/operon/commands.py b/quodlibet/operon/commands.py
index e0a5ef33a..af2dcfa8b 100644
--- a/quodlibet/operon/commands.py
+++ b/quodlibet/operon/commands.py
@@ -227,16 +227,16 @@ class EditCommand(Command):
         # write to tmp file
         fd, path = tempfile.mkstemp(suffix=".txt")
 
-        # XXX: copy mtime here so we can test for changes in tests by
-        # setting a out of date mtime on the source song file
-        copy_mtime(args[0], path)
-
         try:
             try:
                 os.write(fd, dump)
             finally:
                 os.close(fd)
 
+            # XXX: copy mtime here so we can test for changes in tests by
+            # setting a out of date mtime on the source song file
+            copy_mtime(args[0], path)
+
             # only parse the result if the editor returns 0 and the mtime has
             # changed
             old_mtime = mtime(path)
-- 
2.39.2

pler-22.04.0.patch?id=8eefb81b773a400f49d79410656f72ff2bbc1602'>tree</a><a href='/guix/commit/gnu/packages/patches/scribus-1.5.8-poppler-22.04.0.patch?id=8eefb81b773a400f49d79410656f72ff2bbc1602'>commit</a><a href='/guix/diff/gnu/packages/patches/scribus-1.5.8-poppler-22.04.0.patch?id=8eefb81b773a400f49d79410656f72ff2bbc1602'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/scribus-1.5.8-poppler-22.04.0.patch'>
<input type='hidden' name='id' value='8eefb81b773a400f49d79410656f72ff2bbc1602'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=8eefb81b773a400f49d79410656f72ff2bbc1602'>root</a>/<a href='/guix/log/gnu?id=8eefb81b773a400f49d79410656f72ff2bbc1602'>gnu</a>/<a href='/guix/log/gnu/packages?id=8eefb81b773a400f49d79410656f72ff2bbc1602'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=8eefb81b773a400f49d79410656f72ff2bbc1602'>patches</a>/<a href='/guix/log/gnu/packages/patches/scribus-1.5.8-poppler-22.04.0.patch?id=8eefb81b773a400f49d79410656f72ff2bbc1602'>scribus-1.5.8-poppler-22.04.0.patch</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/patches/scribus-1.5.8-poppler-22.04.0.patch?id=8eefb81b773a400f49d79410656f72ff2bbc1602&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-04-25 06:17:16 +0200'>2023-04-25</span></td><td><a href='/guix/commit/gnu/packages/patches/scribus-1.5.8-poppler-22.04.0.patch?id=8495069bed0d51a21ff609f7036ff40d73ff07a8'>gnu: scribus: Fix build with latest poppler.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/patches/scribus-1.5.8-poppler-22.03.0.patch,
gnu/packages/patches/scribus-1.5.8-poppler-22.04.0.patch,
gnu/packages/patches/scribus-1.5.8-poppler-22.09.0.patch,
gnu/packages/patches/scribus-1.5.8-poppler-22.2.0-1.patch,
gnu/packages/patches/scribus-1.5.8-poppler-22.2.0-2.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/scribus.scm (scribus)[source]: Add patches.
[arguments]: Enable WANT_CPP17 option.
</span></span></td><td>Ricardo Wurmus</td></tr>