diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2019-02-03 15:54:48 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2019-02-03 15:54:48 -0700 |
| commit | bc215b100f58da94a79953980a7c96e5d79b0ee8 (patch) | |
| tree | 2281154891384cdae04a580f5e6f08283006cdb7 | |
| parent | a562803b70be59f23a6bb71b97c3eb741610e914 (diff) | |
Commit Debian 3.0 (quilt) metadatadebian/7.20190129-2archive/debian/7.20190129-2
[dgit (8.3) quilt-fixup]
| -rw-r--r-- | debian/patches/debian-changes | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes index 33100d1414..3765434cff 100644 --- a/debian/patches/debian-changes +++ b/debian/patches/debian-changes @@ -15,6 +15,20 @@ upload of upstream version 1.2.3, you could use: clone`.) A single combined diff, containing all the changes, follows. +--- git-annex-7.20190129.orig/Annex/Tmp.hs ++++ git-annex-7.20190129/Annex/Tmp.hs +@@ -27,8 +27,9 @@ withOtherTmp a = do + addCleanup OtherTmpCleanup cleanupOtherTmp + tmpdir <- fromRepo gitAnnexTmpOtherDir + tmplck <- fromRepo gitAnnexTmpOtherLock +- void $ createAnnexDirectory tmpdir +- withSharedLock (const tmplck) (a tmpdir) ++ withSharedLock (const tmplck) $ do ++ void $ createAnnexDirectory tmpdir ++ a tmpdir + + -- | Cleans up any tmp files that were left by a previous + -- git-annex process that got interrupted or failed to clean up after --- git-annex-7.20190129.orig/COPYRIGHT +++ git-annex-7.20190129/COPYRIGHT @@ -54,9 +54,6 @@ Files: static/jquery* |