diff options
| author | Adrian Likins <alikins@grimlock.devel.redhat.com> | 2008-01-29 17:38:52 -0500 |
|---|---|---|
| committer | Adrian Likins <alikins@grimlock.devel.redhat.com> | 2008-01-29 17:38:52 -0500 |
| commit | aa64577a30d8d11bcc89f15393886420c3c97348 (patch) | |
| tree | c152fdac185a88365a29c89121683e358f3793c1 | |
| parent | d3edd527c9fff9878745204d4f0e5f191d883810 (diff) | |
| parent | 18d37e6e8ba7c543c1fea3b4ae41d75df988bfca (diff) | |
| download | third_party-func-aa64577a30d8d11bcc89f15393886420c3c97348.tar.gz third_party-func-aa64577a30d8d11bcc89f15393886420c3c97348.tar.xz third_party-func-aa64577a30d8d11bcc89f15393886420c3c97348.zip | |
resolve conflict in test-it.sh
Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func
Conflicts:
test/test-it.sh
| -rwxr-xr-x | func/certmaster.py | 2 | ||||
| -rw-r--r-- | func/certs.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/func/certmaster.py b/func/certmaster.py index fdb34b8..b74c8d2 100755 --- a/func/certmaster.py +++ b/func/certmaster.py @@ -39,7 +39,7 @@ class CertMaster(object): fqdn = socket.getfqdn() host = socket.gethostname() - if fdqn.find(host) != -1: + if fqdn.find(host) != -1: usename = fqdn else: usename = host diff --git a/func/certs.py b/func/certs.py index 810d17c..413f9ce 100644 --- a/func/certs.py +++ b/func/certs.py @@ -50,7 +50,7 @@ def make_csr(pkey, dest=None, cn=None): else: fqdn = socket.getfqdn() host = socket.gethostname() - if fdqn.find(host) != -1: + if fqdn.find(host) != -1: subj.CN = fqdn else: subj.CN = host |