summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2006-01-12 16:20:20 +0000
committerChris Lumens <clumens@redhat.com>2006-01-12 16:20:20 +0000
commitb36117010978465d4ccbd9d4e129794d4c8f62dc (patch)
treee40f3ae815cea4b1a37876f79399bfa737aa37f0
parent83fadc64785325fb6f96d787dccff1b597a9bbb1 (diff)
downloadanaconda-b36117010978465d4ccbd9d4e129794d4c8f62dc.tar.gz
anaconda-b36117010978465d4ccbd9d4e129794d4c8f62dc.tar.xz
anaconda-b36117010978465d4ccbd9d4e129794d4c8f62dc.zip
Pass the tuple in instead of a reference to fix kickstart package deselection
(#177530).
-rw-r--r--ChangeLog6
-rw-r--r--yuminstall.py4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index eff8230b8..c8da4e16d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-12 Chris Lumens <clumens@redhat.com>
+
+ * yuminstall.py (YumBackend.deseletPackage): Pass the tuple in
+ instead of a reference to fix kickstart package deselection (#177530).
+
2006-01-11 Jesse Keating <jkeating@redhat.com>
* scripts/mk-rescueimage.i386: don't check for arch/arch, just check
@@ -6,6 +11,7 @@
* scripts/mk-rescueimage.x86_64: don't check for arch/arch, just check
for destdir
+>>>>>>> 1.1060
2006-01-11 Jeremy Katz <katzj@redhat.com>
* anaconda.spec: Bump version
diff --git a/yuminstall.py b/yuminstall.py
index 206507d63..44721e61f 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -390,7 +390,7 @@ class AnacondaYum(YumSorter):
def log(self, value, msg):
if value >= 2:
- pass
+ log.debug(msg)
elif value == 1:
log.info(msg)
else:
@@ -960,7 +960,7 @@ class YumBackend(AnacondaBackend):
txmbrs = self.ayum.tsInfo.matchNaevr(name=pkg)
if len(txmbrs) > 0:
- map(lambda x: self.ayum.tsInfo.remove(x), txmbrs)
+ map(lambda x: self.ayum.tsInfo.remove(x.pkgtup), txmbrs)
else:
log.debug("no such package %s" %(pkg,))