Jelajahi Sumber

HUE-6897 [oozie] Ensure that examples_dir exists before installing examples (#566)

https://github.com/cloudera/hue/pull/566
Ivan Dzikovsky 8 tahun lalu
induk
melakukan
4dcf5eb437
1 mengubah file dengan 6 tambahan dan 6 penghapusan
  1. 6 6
      apps/oozie/src/oozie/management/commands/oozie_setup.py

+ 6 - 6
apps/oozie/src/oozie/management/commands/oozie_setup.py

@@ -351,12 +351,6 @@ class Command(NoArgsCommand):
                 'local_dir': local_dir, 'remote_data_dir': remote_data_dir})
     self.fs.do_as_user(self.user.username, self.fs.copyFromLocal, local_dir, remote_data_dir)
 
-    # Load jobs
-    LOG.info(_("Installing examples..."))
-
-    if ENABLE_V2.get():
-      management.call_command('loaddata', 'initial_oozie_examples.json', verbosity=2)
-
     # Get or create sample user directories
     home_dir = Directory.objects.get_home_directory(self.user)
     examples_dir, created = Directory.objects.get_or_create(
@@ -365,6 +359,12 @@ class Command(NoArgsCommand):
       name=Document2.EXAMPLES_DIR
     )
 
+    # Load jobs
+    LOG.info(_("Installing examples..."))
+
+    if ENABLE_V2.get():
+      management.call_command('loaddata', 'initial_oozie_examples.json', verbosity=2)
+
     if IS_HUE_4.get():
       # Install editor oozie examples without doc1 link
       LOG.info("Using Hue 4, will install oozie editor samples.")