Lorax patch

Use lorax instead of buildinstall

pungi.spec

@@ -11,6 +11,7 @@ URL:            https://fedorahosted.org/pungi
 Source0:        https://fedorahosted.org/pungi/attachment/wiki/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       anaconda >= 14.3, yum => 3.2.19, repoview, createrepo >= 0.4.11
+Requires:       lorax
 BuildRequires:  python-devel
 
 BuildArch:      noarch

src/pypungi/__init__.py

@@ -767,46 +767,30 @@ class Pungi(pypungi.PungiBase):
             self._makeMetadata(path, cachedir, repoview=False)
 
     def doBuildinstall(self):
-        """Run anaconda-runtime's buildinstall on the tree."""
+        """Run lorax on the tree."""
 
+        self._inityum()
+        yb = self.ayum
 
-        # setup the buildinstall call
+        product = self.config.get('pungi', 'name')
-        buildinstall = ['/usr/libexec/anaconda/buildinstall']
+        version = self.config.get('pungi', 'version')
-        #buildinstall.append('TMPDIR=%s' % self.workdir) # TMPDIR broken in buildinstall
+        release = '%s %s' % (self.config.get('pungi', 'name'), self.config.get('pungi', 'version'))
 
-        buildinstall.append('--product')
+        variant = self.config.get('pungi', 'flavor')
-        buildinstall.append(self.config.get('pungi', 'name'))
+        bugurl = self.config.get('pungi', 'bugurl')
 
-        if not self.config.get('pungi', 'flavor') == "":
+        workdir = self.workdir
-            buildinstall.append('--variant')
+        outputdir = self.topdir
-            buildinstall.append(self.config.get('pungi', 'flavor'))
-
-        buildinstall.append('--version')
-        buildinstall.append(self.config.get('pungi', 'version'))
-
-        buildinstall.append('--release')
-        buildinstall.append('%s %s' % (self.config.get('pungi', 'name'), self.config.get('pungi', 'version')))
-
-        if self.config.has_option('pungi', 'bugurl'):
-            buildinstall.append('--bugurl')
-            buildinstall.append(self.config.get('pungi', 'bugurl'))
-
-        buildinstall.append('--output')
-        buildinstall.append(self.topdir)
-
-        for mirrorlist in self.mirrorlists:
-            buildinstall.append('--mirrorlist')
-            buildinstall.append(mirrorlist)
-
-        buildinstall.append(self.topdir)
-
-        # Add any extra repos of baseurl type
-        for repo in self.repos:
-            buildinstall.append(repo)
 
         # run the command
-        # TMPDIR is still broken with buildinstall.
+        import pylorax
-        pypungi.util._doRunCommand(buildinstall, self.logger) #, env={"TMPDIR": self.workdir})
+        lorax = pylorax.Lorax()
+        lorax.configure()
+
+        # FIXME get the actual is_beta value
+        lorax.run(yb, product=product, version=version, release=release,
+                  variant=variant, bugurl=bugurl, is_beta=True,
+                  workdir=workdir, outputdir=outputdir)
 
         # write out the tree data for snake
         self.writeinfo('tree: %s' % self.mkrelative(self.topdir))