From 4e968e75ec10ba243f85a9fa11272739ddfd6678 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Aug 2020 12:59:38 -0400 Subject: merged nicolas/borg-fixes --- debian/changelog | 8 +++++++- ...omment_4_7685b1c27b0873b9149bc761f4e734af._comment | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 doc/todo/Fix_Borg.init_on_recent_borg_versions__44___fix_Borg.restored/comment_4_7685b1c27b0873b9149bc761f4e734af._comment diff --git a/debian/changelog b/debian/changelog index 24bbf641..e9d6411d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,16 @@ -propellor (5.10.3) UNRELEASED; urgency=medium +propellor (5.11) UNRELEASED; urgency=medium * Fix display of concurrent output from processes when using Propellor.Property.Conductor. (Reversion introduced in version 5.5.0.) * Support bootstrapping to hosts using cabal 3.x, with new-dist directory. * Makefile: Fix build with cabal 3.x. + * Borg.restored: Fix restoration, which has apparently never worked, + at least back to borg 1.0.9. + Thanks, Nicolas Schodet. + * Borg.init: Added the now required encryption type parameter. + Thanks, Nicolas Schodet. + (API change) -- Joey Hess Fri, 05 Jun 2020 11:26:21 -0400 diff --git a/doc/todo/Fix_Borg.init_on_recent_borg_versions__44___fix_Borg.restored/comment_4_7685b1c27b0873b9149bc761f4e734af._comment b/doc/todo/Fix_Borg.init_on_recent_borg_versions__44___fix_Borg.restored/comment_4_7685b1c27b0873b9149bc761f4e734af._comment new file mode 100644 index 00000000..71ce0ac4 --- /dev/null +++ b/doc/todo/Fix_Borg.init_on_recent_borg_versions__44___fix_Borg.restored/comment_4_7685b1c27b0873b9149bc761f4e734af._comment @@ -0,0 +1,19 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 4""" + date="2020-08-14T16:44:43Z" + content=""" +I've merged your branch, thanks. + +It does seem to me that Borg.init could do the privdata lookup itself, and +set `BORG_PASSPHRASE`. Otherwise the user is currently left with no +indication of how to do that, except for the commit message +[[!commit afab5b2f0b4e06a5c41f064d10f65ead063ab5af]]. + +And, for BorgEncRepokey and BorgEncKeyfile, wouldn't backup and restore +also need the passphrase to be provided? + +(I don't think these questions need to delay releasing propellor with your +fixes, since AFAICS your changes won't impact anything that worked with +propellor before.) +"""]] -- cgit v1.2.3