Patch for new anaconda path

This patch came from Chris Lumens via RHBZ 579873
This commit is contained in:
Jesse Keating 2010-04-14 16:11:10 -07:00
parent be078f9850
commit 6ed01b8852
3 changed files with 4 additions and 7 deletions

View File

@ -10,7 +10,7 @@ License: GPLv2
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-runtime >= 11.4.1.5, yum => 3.2.19, repoview, createrepo >= 0.4.11
Requires: anaconda >= 14.3, yum => 3.2.19, repoview, createrepo >= 0.4.11
BuildRequires: python-devel
BuildArch: noarch

View File

@ -30,10 +30,7 @@ import string
import sys
import yum
sys.path.append("/usr/lib/anaconda")
sys.path.append("/usr/lib/booty")
import anaconda_log
from pyanaconda import anaconda_log
import logging
logger = logging.getLogger("anaconda")
handler = logging.StreamHandler()

View File

@ -756,7 +756,7 @@ class Pungi(pypungi.PungiBase):
# setup the buildinstall call
buildinstall = ['/usr/lib/anaconda-runtime/buildinstall']
buildinstall = ['/usr/libexec/anaconda/buildinstall']
#buildinstall.append('TMPDIR=%s' % self.workdir) # TMPDIR broken in buildinstall
buildinstall.append('--product')
@ -1039,7 +1039,7 @@ cost=500
isolist=[]
anaruntime = '/usr/lib/anaconda-runtime/boot'
anaruntime = '/usr/share/anaconda/boot'
discinfofile = os.path.join(self.topdir, '.discinfo') # we use this a fair amount
pypungi.util._ensuredir(self.isodir, self.logger,