summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--anaconda.spec7
-rw-r--r--yuminstall.py2
3 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4c56b4b2a..239e19fd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-13 Jeremy Katz <katzj@redhat.com>
+
+ * anaconda.spec: Bump version.
+
+ * yuminstall.py (YumBackend.doPostSelection): Only import upgrade
+ as needed, so that we don't need the full chain of deps for pkgorder
+
2006-02-13 Chris Lumens <clumens@redhat.com>
* gui.py: Don't care about missing help text.
diff --git a/anaconda.spec b/anaconda.spec
index bf7b5b26a..dd324738e 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,5 +1,5 @@
Name: anaconda
-Version: 10.92.2
+Version: 10.92.3
Release: 1
License: GPL
Summary: Graphical system installer
@@ -79,6 +79,11 @@ rm -rf $RPM_BUILD_ROOT
/sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
%changelog
+* Mon Feb 13 2006 Jeremy Katz <katzj@redhat.com> - 10.92.3-1
+- Don't debug log about missing help text (clumens)
+- Reduce deps for pkgorder
+- Updated kickstart docs (clumens)
+
* Mon Feb 13 2006 Jeremy Katz <katzj@redhat.com> - 10.92.2-1
- more x86_64 xen guest fixing
diff --git a/yuminstall.py b/yuminstall.py
index ae0f5bc4f..eaa638c5c 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -31,7 +31,6 @@ from sortedtransaction import SplitMediaTransactionData
from genheader import *
from constants import *
from rhpl.translate import _
-from upgrade import upgrade_remove_blacklist
import logging
log = logging.getLogger("anaconda")
@@ -747,6 +746,7 @@ class YumBackend(AnacondaBackend):
self.selectConditionalPackages()
if id.getUpgrade():
+ from upgrade import upgrade_remove_blacklist
for pkg in upgrade_remove_blacklist:
pkgarch = None
pkgnames = None