revisor/base.py | 30 +++++++-----------------------
1 file changed, 7 insertions(+), 23 deletions(-)
New commits:
commit 51ccf5ff97790f75ed7f27801e4134eb28a4f868
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Mon Mar 9 04:50:29 2009 +0100
Fix pkgsack excludes
diff --git a/revisor/base.py b/revisor/base.py
index e691e4a..fbeeb97 100644
--- a/revisor/base.py
+++ b/revisor/base.py
@@ -310,6 +310,13 @@ class RevisorBase:
self.log.debug(_("Building a nice package list from ksdata, and adding it to
the transaction"), level=6)
+
+ if self.cfg.kickstart_uses_pkgsack_exclude:
+ for pkg in excludedList:
+ self.cfg.yumobj.conf.exclude.append(pkg)
+
+ self.log.debug(_("Using pkgsack excludes, the list of packages to
exclude is now: %r") % self.cfg.yumobj.conf.exclude, level=9)
+
# Actually, let's figure out what mode we're in and call something once
we know which way to go
if self.cfg.mode_respin:
@@ -341,12 +348,6 @@ class RevisorBase:
warnings = []
- if self.cfg.kickstart_uses_pkgsack_exclude:
- for pkg in excludedList:
- self.cfg.yumobj.conf.exclude.append(pkg)
-
- self.log.debug(_("Using pkgsack excludes, the list of packages to
exclude is now: %r") % self.cfg.yumobj.conf.exclude, level=9)
-
core_selected = False
for ksgroup in groupList:
if hasattr(ksgroup,"name"):
@@ -494,12 +495,6 @@ class RevisorBase:
warnings = []
- if self.cfg.kickstart_uses_pkgsack_exclude:
- for pkg in excludedList:
- self.cfg.yumobj.conf.exclude.append(pkg)
-
- self.log.debug(_("Using pkgsack excludes, the list of packages to
exclude is now: %r") % self.cfg.yumobj.conf.exclude, level=9)
-
# It seems anaconda always selects @core:
# EL5:
http://git.fedorahosted.org/git/?p=anaconda.git;a=blob;f=kickstart.py;h=3...
# F8:
http://git.fedorahosted.org/git/?p=anaconda.git;a=blob;f=kickstart.py;h=6...
@@ -788,17 +783,6 @@ class RevisorBase:
pbar = self.progress_bar(_("Select kickstart packages"))
-##
-## Exclude packages in the packageSack from ksdata
-##
-
- if self.cfg.kickstart_uses_pkgsack_exclude:
- for pkg in excludedList:
- if pkg in pkglist:
- self.cfg.yumobj.conf.exclude.extend(pkg)
-
- self.log.debug(_("Using pkgsack excludes, excluded packages is now:
%r") % self.cfg.yumobj.conf.exclude, level=9)
-
# It seems anaconda always selects @core:
# EL5:
http://git.fedorahosted.org/git/?p=anaconda.git;a=blob;f=kickstart.py;h=3...
# F8:
http://git.fedorahosted.org/git/?p=anaconda.git;a=blob;f=kickstart.py;h=6...