summaryrefslogtreecommitdiffstats
path: root/ipapython/ipautil.py
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2010-05-27 11:02:39 -0400
committerRob Crittenden <rcritten@redhat.com>2010-05-27 11:02:39 -0400
commitc67b47f9f693d0209572b34a6cf7927dcbf22200 (patch)
tree389d699b6a6337ff7ff2419e3c200a219c8d8ac6 /ipapython/ipautil.py
parent49b3d3ba0fec9907d2fa42c55905fbecb644e3b2 (diff)
downloadfreeipa-c67b47f9f693d0209572b34a6cf7927dcbf22200.tar.gz
freeipa-c67b47f9f693d0209572b34a6cf7927dcbf22200.tar.xz
freeipa-c67b47f9f693d0209572b34a6cf7927dcbf22200.zip
gpg2 requires --batch to use the --passphrase* arguments.
This was causing replica creation and installation to fail. 596446
Diffstat (limited to 'ipapython/ipautil.py')
-rw-r--r--ipapython/ipautil.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index efc7e0285..e7bcbc046 100644
--- a/ipapython/ipautil.py
+++ b/ipapython/ipautil.py
@@ -190,7 +190,7 @@ def encrypt_file(source, dest, password, workdir = None):
#give gpg a fake dir so that we can leater remove all
#the cruft when we clean up the tempdir
os.mkdir(gpgdir)
- args = ['/usr/bin/gpg', '--homedir', gpgdir, '--passphrase-fd', '0', '--yes', '--no-tty', '-o', dest, '-c', source]
+ args = ['/usr/bin/gpg', '--batch', '--homedir', gpgdir, '--passphrase-fd', '0', '--yes', '--no-tty', '-o', dest, '-c', source]
run(args, password)
except:
raise
@@ -220,7 +220,7 @@ def decrypt_file(source, dest, password, workdir = None):
#give gpg a fake dir so that we can leater remove all
#the cruft when we clean up the tempdir
os.mkdir(gpgdir)
- args = ['/usr/bin/gpg', '--homedir', gpgdir, '--passphrase-fd', '0', '--yes', '--no-tty', '-o', dest, '-d', source]
+ args = ['/usr/bin/gpg', '--batch', '--homedir', gpgdir, '--passphrase-fd', '0', '--yes', '--no-tty', '-o', dest, '-d', source]
run(args, password)
except:
raise