diff -Nru deja-dup-22.0/debian/changelog deja-dup-22.0/debian/changelog --- deja-dup-22.0/debian/changelog 2013-03-28 18:02:11.000000000 +0000 +++ deja-dup-22.0/debian/changelog 2014-03-01 17:08:04.000000000 +0000 @@ -1,3 +1,12 @@ +deja-dup (22.0-0ubuntu5) precise; urgency=low + + * debian/patches/kill-lockfile.patch + - Backport patch from trunk that removes the lockfile placed by + duplicity to avoid concurrency. Deja-dup avoid concurrency using + its own method using Dbus (LP: #1281066) + + -- Louis Bouchard Mon, 17 Feb 2014 17:09:35 +0100 + deja-dup (22.0-0ubuntu4) precise-proposed; urgency=low * debian/patches/spread-backup-epoch.patch: diff -Nru deja-dup-22.0/debian/patches/kill-lockfile.patch deja-dup-22.0/debian/patches/kill-lockfile.patch --- deja-dup-22.0/debian/patches/kill-lockfile.patch 1970-01-01 00:00:00.000000000 +0000 +++ deja-dup-22.0/debian/patches/kill-lockfile.patch 2014-03-01 17:08:39.000000000 +0000 @@ -0,0 +1,15 @@ +--- a/common/DuplicityInstance.vala ++++ b/common/DuplicityInstance.vala +@@ -175,6 +175,12 @@ + foreach(string a in argv) + real_argv[i++] = a; + ++ // Kill any lockfile, since our cancel methods may leave them around. ++ // We already are pretty sure we don't have other duplicities in our ++ // archive directories, because we use our own and we ensure we only have ++ // one deja-dup running at a time via DBus. ++ Posix.system("/bin/rm -f " + Shell.quote(cache_dir) + "/" + Config.PACKAGE + "/*/lockfile.lock"); ++ + Process.spawn_async_with_pipes(null, real_argv, real_envp, + SpawnFlags.SEARCH_PATH | + SpawnFlags.DO_NOT_REAP_CHILD | diff -Nru deja-dup-22.0/debian/patches/series deja-dup-22.0/debian/patches/series --- deja-dup-22.0/debian/patches/series 2013-03-28 17:58:59.000000000 +0000 +++ deja-dup-22.0/debian/patches/series 2014-03-01 17:08:04.000000000 +0000 @@ -1,3 +1,4 @@ allow-resuming-encrypted-backup.patch ignore-steam.patch spread-backup-epoch.patch +kill-lockfile.patch