Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package git-annex Fixes an race condition in the test suite that causes FTBFS. unblock git-annex/7.20190129-3 -- System Information: Debian Release: buster/sid APT prefers testing APT policy: (900, 'testing'), (50, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 4.19.0-2-amd64 (SMP w/4 CPU cores) Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), LANGUAGE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled -- Sean Whitton
diff -Nru git-annex-7.20190129/debian/changelog git-annex-7.20190129/debian/changelog --- git-annex-7.20190129/debian/changelog 2019-02-03 15:54:29.000000000 -0700 +++ git-annex-7.20190129/debian/changelog 2019-03-31 12:34:02.000000000 -0700 @@ -1,3 +1,10 @@ +git-annex (7.20190129-3) unstable; urgency=medium + + * Resolve a race in test cleanup by making second attempt more forceful + (Closes: #924800). + + -- Sean Whitton <spwhit...@spwhitton.name> Sun, 31 Mar 2019 12:34:02 -0700 + git-annex (7.20190129-2) unstable; urgency=medium * Cherry pick upstream commit a64fca92f6dfea086b7b9e65a2b83fb50fee1ecf. diff -Nru git-annex-7.20190129/debian/patches/debian-changes git-annex-7.20190129/debian/patches/debian-changes --- git-annex-7.20190129/debian/patches/debian-changes 2019-02-03 15:54:29.000000000 -0700 +++ git-annex-7.20190129/debian/patches/debian-changes 2019-03-31 12:34:02.000000000 -0700 @@ -65,3 +65,25 @@ , unlesscrippled ("v7 locked", testMode opts (RepoVersion 7)) , Just ("v5 direct", (testMode opts (RepoVersion 5)) { forceDirect = True }) ] +--- git-annex-7.20190129.orig/Test/Framework.hs ++++ git-annex-7.20190129/Test/Framework.hs +@@ -271,7 +271,7 @@ finalCleanup = whenM (doesDirectoryExist + Utility.ThreadScheduler.Seconds 10 + whenM (doesDirectoryExist tmpdir) $ do + Annex.Action.reapZombies +- removeDirectoryRecursive tmpdir ++ removePathForcibly tmpdir + + checklink :: FilePath -> Assertion + checklink f = +--- git-annex-7.20190129.orig/git-annex.cabal ++++ git-annex-7.20190129/git-annex.cabal +@@ -313,7 +313,7 @@ Executable git-annex + unix-compat, + SafeSemaphore, + async, +- directory (>= 1.2), ++ directory (>= 1.2.7.0), + disk-free-space, + filepath, + IfElse,
signature.asc
Description: PGP signature