Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
baas
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
itminedu
baas
Commits
4536ef7b
Commit
4536ef7b
authored
Mar 04, 2016
by
Giorgos Korfiatis
Committed by
Efthymia Bika
Mar 07, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass gpg homedir option to duplicity
parent
c51bafae
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
0 deletions
+42
-0
make_duplicity.sh
make_duplicity.sh
+1
-0
src/duplicity-patches/gpg_homedir.patch
src/duplicity-patches/gpg_homedir.patch
+41
-0
No files found.
make_duplicity.sh
View file @
4536ef7b
...
...
@@ -74,6 +74,7 @@ patch -N -p0 < $ROOTPATH/src/duplicity-patches/timeview.patch
patch
-N
-p0
<
$ROOTPATH
/src/duplicity-patches/syspath.patch
patch
-N
-p0
<
$ROOTPATH
/src/duplicity-patches/cacert.patch
patch
-N
-p0
<
$ROOTPATH
/src/duplicity-patches/setrlimit.patch
patch
-N
-p0
<
$ROOTPATH
/src/duplicity-patches/gpg_homedir.patch
LIBRSYNC_DIR
=
/usr/local python setup.py build
--executable
=
"/usr/bin/env python"
cd
build/lib.
*
cp
-pr
*
$DUPL
/lib
...
...
src/duplicity-patches/gpg_homedir.patch
0 → 100644
View file @
4536ef7b
=== modified file 'duplicity/commandline.py'
--- duplicity/commandline.py 2016-02-10 17:15:49 +0000
+++ duplicity/commandline.py 2016-03-04 13:32:51 +0000
@@ -398,6 +398,8 @@
parser.add_option("--gpg-binary", type="file", metavar=_("path"))
+ parser.add_option("--gpg-homedir", metavar=_("path"))
+
parser.add_option("--gpg-options", action="extend", metavar=_("options"))
# TRANSL: Used in usage help to represent an ID for a hidden GnuPG key. Example:
=== modified file 'duplicity/globals.py'
--- duplicity/globals.py 2015-10-10 00:02:35 +0000
+++ duplicity/globals.py 2016-03-04 13:33:18 +0000
@@ -88,6 +88,9 @@
# Options to pass to gpg
gpg_options = ''
+# Option 'homedir' to pass to gpg
+gpg_homedir = ''
+
# Maximum file blocksize
max_blocksize = 2048
=== modified file 'duplicity/gpg.py'
--- duplicity/gpg.py 2015-11-05 15:36:58 +0000
+++ duplicity/gpg.py 2016-03-04 13:35:50 +0000
@@ -124,6 +124,9 @@
if globals.gpg_options:
for opt in globals.gpg_options.split():
gnupg.options.extra_args.append(opt)
+ if globals.gpg_homedir:
+ gnupg.options.extra_args.append('--homedir')
+ gnupg.options.extra_args.append(globals.gpg_homedir)
cmdlist = []
if profile.sign_key:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment