Merge lp:~louis/duplicity/allow-concurrency-manpage into lp:duplicity/0.6

[Louis Bouchard]

Add option to manpage

[edso (ed.so)]

thanks,

maybe you should mention that the option might be helpful in case duplicity for some reason didn't clean up and the lock file is stale.

..ede/duply.net

[lp:~louis/duplicity/allow-concurrency-manpage]

955. By Louis Bouchard on 2014-01-20

Reformat --allow-concurrency text and add mention of stale lockfile

[Louis Bouchard (louis)]

Good catch ed; just added your suggestion.

[edso (ed.so)]

this reminded me and i checked. on a quick look at your lockfile addition it seem the lockfile is completely ignored and not refreshed with --allow-concurrency.

so what happens in the case outlined above?
A. shouldn't the stale lockfile be refreshed to the latest instance?
B. shouldn't it at least be deleted after the second duplicity finished.

..ede

[Louis Bouchard (louis)]

No, the option is to completely override the lockfile usage. Using the option will let duplicity run w/o using the locking mechanism.

If you see this as an issue, please create a new bug and I will work on adding this, it shouldn't be too hard

[edso (ed.so)]

let's see what Ken says about it.

my vote is, if the lock file is the default mode (which is good) there must be a way to deal with stale locks.

easiest option would be that the most current duplicity run takes over the lock when run with --allow-concurrency and cleans it if finished.
additionally we should clearly state "If you know what you are doing!" to the option's manpage description.

i'd rather save the bug report as this is still unreleased, more work in progress so far.

..ede

=== modified file 'bin/duplicity.1'
--- bin/duplicity.1	2013-12-26 14:33:05 +0000
+++ bin/duplicity.1	2014-01-20 10:11:37 +0000
@@ -339,6 +339,15 @@
 .SH OPTIONS
 
 .TP
+.BI --allow-concurrency
+Allow duplicity to run more than one instance in the same user context.
+Upon startup, duplicity puts a lock file into the cache directory which
+prevents a second instance of duplicity to run at the same time.
+Using this option will override the locking mechanism and allow for a 
+second duplicity instance to run. This may become useful when a stale
+lockfile has been left behind.
+
+.TP
 .BI --allow-source-mismatch
 Do not abort on attempts to use the same archive dir or remote backend
 to back up different directories. duplicity will tell you if you need