diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2007-11-15 11:09:17 -0500 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2007-11-15 11:09:17 -0500 |
| commit | 949b4a0bf7ed8ce466617b9623e833cd26a46c13 (patch) | |
| tree | b85e6ba61612e093491da3369fe95d61546fb44b /ipa-server | |
| parent | 6f268a185c86e44d0ffa06160b422a07a396c5d1 (diff) | |
| download | freeipa-949b4a0bf7ed8ce466617b9623e833cd26a46c13.tar.gz freeipa-949b4a0bf7ed8ce466617b9623e833cd26a46c13.tar.xz freeipa-949b4a0bf7ed8ce466617b9623e833cd26a46c13.zip | |
Check for existance of of the target file in update_file. It used to silently
fail if the file it was to update didn't exist.
Diffstat (limited to 'ipa-server')
| -rw-r--r-- | ipa-server/ipaserver/httpinstance.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ipa-server/ipaserver/httpinstance.py b/ipa-server/ipaserver/httpinstance.py index b505d73a8..60d33eedc 100644 --- a/ipa-server/ipaserver/httpinstance.py +++ b/ipa-server/ipaserver/httpinstance.py @@ -50,6 +50,10 @@ def update_file(filename, orig, subst): else: sys.stdout.write(p.sub(subst, line)) fileinput.close() + return 0 + else: + print "File %s doesn't exist." % filename + return 1 class HTTPInstance(service.Service): def __init__(self): @@ -137,4 +141,5 @@ class HTTPInstance(service.Service): def __set_mod_nss_port(self): self.step("Setting mod_nss port to 443") - update_file(NSS_CONF, '8443', '443') + if update_file(NSS_CONF, '8443', '443') != 0: + print "Updating %s failed." % NSS_CONF |