瀏覽代碼

[oozie] Move capture-output to bottom in Shell action

Romain Rigaux 13 年之前
父節點
當前提交
e5ad97adf3
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 2 2
      apps/oozie/src/oozie/templates/editor/gen/workflow-shell.xml.mako
  2. 1 1
      apps/oozie/src/oozie/tests.py

+ 2 - 2
apps/oozie/src/oozie/templates/editor/gen/workflow-shell.xml.mako

@@ -30,11 +30,11 @@
               <${ param['type'] }>${ param['value'] }</${ param['type'] }>
             % endfor
 
+            ${ common.distributed_cache(node.get_files(), node.get_archives()) }
+
             % if node.capture_output:
               <capture-output/>
             % endif
-
-            ${ common.distributed_cache(node.get_files(), node.get_archives()) }
         </shell>
         <ok to="${ node.get_child('ok') }"/>
         <error to="${ node.get_child('error') }"/>

+ 1 - 1
apps/oozie/src/oozie/tests.py

@@ -549,8 +549,8 @@ class TestEditor(OozieMockBase):
             <name-node>${nameNode}</name-node>
             <exec>hello.py</exec>
               <argument>World!</argument>
-              <capture-output/>
             <file>hello.py#hello.py</file>
+              <capture-output/>
         </shell>""" in xml, xml)
 
     action1.capture_output = False