This is an automated email from the ASF dual-hosted git repository.
aw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yetus.git
The following commit(s) were added to refs/heads/master by this push:
new ffcf2b9 YETUS-823. releasedocmaker-jar-with-dependencies is missing
dependencies
ffcf2b9 is described below
commit ffcf2b9649a828a4f563e71e647c5f3d040256d3
Author: Allen Wittenauer
AuthorDate: Mon Mar 25 13:27:50 2019 -0700
YETUS-823. releasedocmaker-jar-with-dependencies is missing dependencies
Signed-off-by: Allen Wittenauer
---
releasedocmaker/pom.xml| 8 ++--
.../src/main/assemblies/jar-with-dependencies.xml | 46 ++
.../src/main/python/releasedocmaker/__init__.py| 7 ++--
3 files changed, 54 insertions(+), 7 deletions(-)
diff --git a/releasedocmaker/pom.xml b/releasedocmaker/pom.xml
index 9b6b7a2..6f93ab0 100644
--- a/releasedocmaker/pom.xml
+++ b/releasedocmaker/pom.xml
@@ -112,9 +112,9 @@
org.apache.yetus.releasedocmaker.ReleaseDocMaker
-
-jar-with-dependencies
-
+
+
src/main/assemblies/jar-with-dependencies.xml
+
@@ -127,7 +127,7 @@
${jython-compile-maven-plugin.version}
-package
+compile
jython
diff --git a/releasedocmaker/src/main/assemblies/jar-with-dependencies.xml
b/releasedocmaker/src/main/assemblies/jar-with-dependencies.xml
new file mode 100644
index 000..3528e16
--- /dev/null
+++ b/releasedocmaker/src/main/assemblies/jar-with-dependencies.xml
@@ -0,0 +1,46 @@
+
+
+http://maven.apache.org/ASSEMBLY/2.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0
http://maven.apache.org/xsd/assembly-2.0.0.xsd;>
+
+ jar-with-dependencies
+
+jar
+
+ false
+
+
+ /
+ true
+ true
+ runtime
+
+
+
+
+
${project.build.directory}/jython-plugins-tmp/Lib/site-packages
+ Lib
+
+**
+
+
+
+
diff --git a/releasedocmaker/src/main/python/releasedocmaker/__init__.py
b/releasedocmaker/src/main/python/releasedocmaker/__init__.py
index ae70165..900f497 100755
--- a/releasedocmaker/src/main/python/releasedocmaker/__init__.py
+++ b/releasedocmaker/src/main/python/releasedocmaker/__init__.py
@@ -698,14 +698,15 @@ def main():
if options.output_directory is not None:
# Create the output directory if it does not exist.
try:
-os.makedirs(options.output_directory)
+if not os.path.exists(options.output_directory):
+os.makedirs(options.output_directory)
except OSError as exc:
if exc.errno == errno.EEXIST and os.path.isdir(
options.output_directory):
pass
else:
-print "Unable to create output directory %s: %s" % \
-(options.output_directory, exc.message)
+print "Unable to create output directory %s: %u, %s" % \
+(options.output_directory, exc.errno, exc.message)
sys.exit(1)
os.chdir(options.output_directory)
