From de3537026fc2b955bd187c8f784d1a3b2fb8d8ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= besser82@fedoraproject.org Date: Sun, 30 Apr 2017 18:32:50 +0200 Subject: Add patch fixing race-condition when generating examples
--- shogun-6.0.0-do_not_fail_if_dir_exists.patch | 45 ++++++++++++++++++++++++++++ shogun.spec | 1 + 2 files changed, 46 insertions(+) create mode 100644 shogun-6.0.0-do_not_fail_if_dir_exists.patch
diff --git a/shogun-6.0.0-do_not_fail_if_dir_exists.patch b/shogun-6.0.0-do_not_fail_if_dir_exists.patch new file mode 100644 index 0000000..e040f79 --- /dev/null +++ b/shogun-6.0.0-do_not_fail_if_dir_exists.patch @@ -0,0 +1,45 @@ +From c819a9b76bb64667c32e0f3b70e1cbba2234922d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= besser82@fedoraproject.org +Date: Sun, 30 Apr 2017 18:20:12 +0200 +Subject: [PATCH] Do not fail if dir exists + +--- + examples/meta/generator/generate.py | 18 +++++++++++++----- + 1 file changed, 13 insertions(+), 5 deletions(-) + +diff --git a/examples/meta/generator/generate.py b/examples/meta/generator/generate.py +index 908667b..4e30588 100755 +--- a/examples/meta/generator/generate.py ++++ b/examples/meta/generator/generate.py +@@ -88,8 +88,13 @@ def translateExamples(inputDir, outputDir, targetsDir, ctagsFile, + extension = target["FileExtension"] + + # Create directory if it does not exist +- if not os.path.exists(directory): +- os.makedirs(directory) ++ try: ++ os.makedirs(name=directory, exist_ok=True) ++ except: ++ try: ++ os.makedirs(directory) ++ except OSError: ++ pass + + # Write translation + outputFile = os.path.join(directory, +@@ -98,9 +103,12 @@ def translateExamples(inputDir, outputDir, targetsDir, ctagsFile, + + # create subdirectories if they don't exist yet + try: +- os.makedirs(os.path.dirname(outputFile)) +- except OSError: +- pass ++ os.makedirs(name=os.path.dirname(outputFile), exist_ok=True) ++ except: ++ try: ++ os.makedirs(os.path.dirname(outputFile)) ++ except OSError: ++ pass + + with open(outputFile, "w") as nf: + nf.write(translation) diff --git a/shogun.spec b/shogun.spec index 4b815e9..48817a6 100644 --- a/shogun.spec +++ b/shogun.spec @@ -159,6 +159,7 @@ Patch0: %{?giturl}/commit/ffb80ca135ff5686e102d285df47ce0fc92f53b6.patch#/shogu Patch1: %{?giturl}/commit/6d960649921e65dea4d988448579564175a4ca59.patch#/shogun-6.0.0-fix_python_modular_tests.patch Patch2: %{?giturl}/commit/3e9e98e508285d989b21629e7c8f872a00e34e4a.patch#/shogun-6.0.0-fix_python_modular_examples.patch Patch3: %{?giturl}/commit/308f9245ad81999a8e046b9ad8c3167ffa904f2e.patch#/shogun-6.0.0-fix_find_Scala.patch +Patch4: %{?giturl}/pull/3806.patch#/shogun-6.0.0-do_not_fail_if_dir_exists.patch
BuildRequires: arpack-devel BuildRequires: arprec-devel
scm-commits@lists.fedoraproject.org