From 6ed01b885232453696bc357d28db8534800d7176 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 14 Apr 2010 16:11:10 -0700 Subject: [PATCH] Patch for new anaconda path This patch came from Chris Lumens via RHBZ 579873 --- pungi.spec | 2 +- src/bin/pkgorder | 5 +---- src/pypungi/__init__.py | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pungi.spec b/pungi.spec index 67afd886..bdd77d02 100644 --- a/pungi.spec +++ b/pungi.spec @@ -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 diff --git a/src/bin/pkgorder b/src/bin/pkgorder index a43be7cf..944876b9 100755 --- a/src/bin/pkgorder +++ b/src/bin/pkgorder @@ -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() diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py index 0014f2f9..7ec506bb 100644 --- a/src/pypungi/__init__.py +++ b/src/pypungi/__init__.py @@ -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,