commit 027b5c352e1fd5cb1a9d48a34e01edc690a466c5
Author: Till Maas <opensource(a)till.name>
Date: Tue Nov 18 18:18:42 2014 +0100
sigulsign_unsigned: Do not use Python 2.7 format
Python 2.5 on RHEL/CentOS 6 does not support "{}".format(), therefore do
not use it.
scripts/sigulsign_unsigned.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/scripts/sigulsign_unsigned.py b/scripts/sigulsign_unsigned.py
index ddb5c67..5e80cbd 100755
--- a/scripts/sigulsign_unsigned.py
+++ b/scripts/sigulsign_unsigned.py
@@ -160,10 +160,10 @@ def get_gpg_agent_passphrase(cache_id, ask=False,
error_message="X",
response, error = gpg_agent.communicate(cmdline)
if gpg_agent.returncode != 0:
- raise RuntimeError("gpg-agent-connect error: {}:{}".format(
+ raise RuntimeError("gpg-agent-connect error: {0}:{1}".format(
gpg_agent.returncode, error))
elif not response.startswith("OK"):
- raise RuntimeError("gpg-agent-connect error message: {}".format(
+ raise RuntimeError("gpg-agent-connect error message: {0}".format(
response))
else:
passphrase = response[3:-1].decode("hex")
@@ -341,7 +341,7 @@ class SigulHelper(object):
except:
fas_username = getpass.getuser()
- cache_id = "sigul:{}:{}".format(fas_username, key)
+ cache_id = "sigul:{0}:{1}".format(fas_username, key)
try:
self.password = get_gpg_agent_passphrase(cache_id,
ask=ask_with_agent)