From b61f31bf15e733de5881cc070feb57aa3686c92d Mon Sep 17 00:00:00 2001
From: Matthew Harmsen <mharmsen@redhat.com>
Date: Fri, 4 Jan 2013 22:01:07 -0800
Subject: Use tomcatjss 7.1.0 and fix weird errno=0 exception

* TRAC Ticket #469 - Dogtag 10: Fix tomcatjss issue in pki-core.spec and
  dogtag-pki.spec . . .
* TRAC Ticket #468 - pkispawn throws exception
---
 base/common/shared/conf/pki.policy      | 2 +-
 base/deploy/etc/default.cfg             | 2 +-
 base/deploy/scripts/operations          | 2 +-
 base/deploy/src/scriptlets/pkijython.py | 8 +++++++-
 4 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'base')

diff --git a/base/common/shared/conf/pki.policy b/base/common/shared/conf/pki.policy
index 4ae2de734..52e3d7fe1 100644
--- a/base/common/shared/conf/pki.policy
+++ b/base/common/shared/conf/pki.policy
@@ -138,7 +138,7 @@ grant codeBase "file:/usr/share/java/tomcat/-" {
         permission java.security.AllPermission;
 };
 
-grant codeBase "file:/usr/share/java/tomcat7jss.jar" {
+grant codeBase "file:/usr/share/java/tomcatjss.jar" {
         permission java.security.AllPermission;
 };
 
diff --git a/base/deploy/etc/default.cfg b/base/deploy/etc/default.cfg
index 238912fcb..3106ba53f 100644
--- a/base/deploy/etc/default.cfg
+++ b/base/deploy/etc/default.cfg
@@ -291,7 +291,7 @@ pki_resteasy_jaxb_provider_jar=%(resteasy_lib)s/resteasy-jaxb-provider.jar
 pki_resteasy_jaxrs_jar=%(resteasy_lib)s/resteasy-jaxrs.jar
 pki_resteasy_jettison_provider_jar=%(resteasy_lib)s/resteasy-jettison-provider.jar
 pki_scannotation_jar=/usr/share/java/scannotation.jar
-pki_tomcatjss_jar=/usr/share/java/tomcat7jss.jar
+pki_tomcatjss_jar=/usr/share/java/tomcatjss.jar
 pki_velocity_jar=/usr/share/java/velocity.jar
 pki_xerces_j2_jar=/usr/share/java/xerces-j2.jar
 pki_xml_commons_apis_jar=/usr/share/java/xml-commons-apis.jar
diff --git a/base/deploy/scripts/operations b/base/deploy/scripts/operations
index 227250d59..63a6bdbe7 100644
--- a/base/deploy/scripts/operations
+++ b/base/deploy/scripts/operations
@@ -1210,7 +1210,7 @@ verify_symlinks()
         [resteasy-jaxrs.jar]=${RESTEASY_LIB}/resteasy-jaxrs.jar
         [resteasy-jettison-provider.jar]=${RESTEASY_LIB}/resteasy-jettison-provider.jar
         [scannotation.jar]=${java_dir}/scannotation.jar
-        [tomcatjss.jar]=${java_dir}/tomcat7jss.jar
+        [tomcatjss.jar]=${java_dir}/tomcatjss.jar
         [velocity.jar]=${java_dir}/velocity.jar
         [xerces-j2.jar]=${java_dir}/xerces-j2.jar
         [xml-commons-apis.jar]=${java_dir}/xml-commons-apis.jar
diff --git a/base/deploy/src/scriptlets/pkijython.py b/base/deploy/src/scriptlets/pkijython.py
index fac352fdb..a7635c130 100644
--- a/base/deploy/src/scriptlets/pkijython.py
+++ b/base/deploy/src/scriptlets/pkijython.py
@@ -313,7 +313,13 @@ class rest_client:
         try:
             os.makedirs(path)
         except OSError, e:
-            if exc.errno == errno.EEXIST and os.path.isdir(path):
+            if e.errno == 0:
+                # Avoid the following weird python/jython exception:
+                #
+                #     [Errno 0] couldn't make directories: <path>
+                #
+                pass
+            elif e.errno == errno.EEXIST and os.path.isdir(path):
                 pass
             else:
                 raise
-- 
cgit