[elbe-devel] [PATCH 4/5] initvmaction: Run repodir before preprocess

[Bastian Germann]

repodir's logical place in the command pipeline is before preprocess
because preprocess will rely on any <repodir> element to be replaced.

Add the Repodir context manager at the right place and catch RepodirError.
The web servers will be terminated with the context manager.

The rest of the change is just indenting the inner context by two levels.

Signed-off-by: Bastian Germann <bage at linutronix.de>
---
 elbepack/initvmaction.py | 52 ++++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/elbepack/initvmaction.py b/elbepack/initvmaction.py
index ee943193c1..7e86c9f92b 100644
--- a/elbepack/initvmaction.py
+++ b/elbepack/initvmaction.py
@@ -15,6 +15,8 @@ import datetime
 
 import libvirt
 
+from tempfile import NamedTemporaryFile
+
 import elbepack
 from elbepack.treeutils import etree
 from elbepack.directories import elbe_exe
@@ -23,6 +25,7 @@ from elbepack.shellhelper import CommandError, system, command_out_stderr, \
 from elbepack.filesystem import TmpdirFilesystem
 from elbepack.elbexml import ElbeXML, ValidationError, ValidationMode
 from elbepack.config import cfg
+from elbepack.repodir import RepodirError, Repodir
 from elbepack.xmlpreprocess import PreprocessWrapper
 
 def is_soap_local():
@@ -255,32 +258,39 @@ class AttachAction(InitVMAction):
 
 
 
-def submit_and_dl_result(xmlfile, cdrom, opt):
+def submit_and_dl_result(input_xmlfile, cdrom, opt):
 
     # pylint: disable=too-many-statements
     # pylint: disable=too-many-branches
 
     try:
-        with PreprocessWrapper(xmlfile, opt) as ppw:
-            xmlfile = ppw.preproc
-
-            ret, prjdir, err = command_out_stderr(
-                '%s control create_project' % (elbe_exe))
-            if ret != 0:
-                print("elbe control create_project failed.", file=sys.stderr)
-                print(err, file=sys.stderr)
-                print("Giving up", file=sys.stderr)
-                sys.exit(20)
-
-            prjdir = prjdir.strip()
-
-            cmd = '%s control set_xml %s %s' % (elbe_exe, prjdir, xmlfile)
-            ret, _, err = command_out_stderr(cmd)
-            if ret != 0:
-                print("elbe control set_xml failed2", file=sys.stderr)
-                print(err, file=sys.stderr)
-                print("Giving up", file=sys.stderr)
-                sys.exit(20)
+        with NamedTemporaryFile(prefix="elbe-repodir", suffix="xml") as tmpfile:
+            xmlfile = tmpfile.name
+            with Repodir(input_xmlfile, xmlfile):
+                with PreprocessWrapper(xmlfile, opt) as ppw:
+                    xmlfile = ppw.preproc
+
+                    ret, prjdir, err = command_out_stderr(
+                        '%s control create_project' % (elbe_exe))
+                    if ret != 0:
+                        print("elbe control create_project failed.", file=sys.stderr)
+                        print(err, file=sys.stderr)
+                        print("Giving up", file=sys.stderr)
+                        sys.exit(20)
+
+                    prjdir = prjdir.strip()
+
+                    cmd = '%s control set_xml %s %s' % (elbe_exe, prjdir, xmlfile)
+                    ret, _, err = command_out_stderr(cmd)
+                    if ret != 0:
+                        print("elbe control set_xml failed2", file=sys.stderr)
+                        print(err, file=sys.stderr)
+                        print("Giving up", file=sys.stderr)
+                        sys.exit(20)
+    except RepodirError as err:
+        print("%s repodir failed" % elbe_exe, file=sys.stderr)
+        print(err, file=sys.stderr)
+        sys.exit(20)
     except CommandError:
         # this is the failure from PreprocessWrapper
         # it already printed the error message from
-- 
2.30.2