diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2012-10-08 08:02:55 -0400 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2012-10-10 17:33:43 +0200 |
| commit | 7c0f1ea5018dd692666e8c758e81f9495d14b760 (patch) | |
| tree | a5307d9689f54367c728be332ee788f835319e4a | |
| parent | 595b37d6bb3b42543679d06b577891acff919be1 (diff) | |
| download | freeipa-7c0f1ea5018dd692666e8c758e81f9495d14b760.tar.gz freeipa-7c0f1ea5018dd692666e8c758e81f9495d14b760.tar.xz freeipa-7c0f1ea5018dd692666e8c758e81f9495d14b760.zip | |
replica-install: Don't copy Firefox config extension files if they're not in the replica file
This allows cloning from older masters.
https://fedorahosted.org/freeipa/ticket/3150
| -rwxr-xr-x | install/tools/ipa-replica-install | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index c1679c723..8f55d7578 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -207,8 +207,12 @@ def install_http(config, auto_redirect): try: shutil.copy(config.dir + "/preferences.html", "/usr/share/ipa/html/preferences.html") shutil.copy(config.dir + "/configure.jar", "/usr/share/ipa/html/configure.jar") - shutil.copy(config.dir + "/krb.js", "/usr/share/ipa/html/krb.js") - shutil.copy(config.dir + "/kerberosauth.xpi", "/usr/share/ipa/html/kerberosauth.xpi") + if ipautil.file_exists(config.dir + "/krb.js"): + shutil.copy( + config.dir + "/krb.js", "/usr/share/ipa/html/krb.js") + shutil.copy( + config.dir + "/kerberosauth.xpi", + "/usr/share/ipa/html/kerberosauth.xpi") except Exception, e: print "error copying files: " + str(e) sys.exit(1) |