* yuminstall.py (doPostSelection): remove packages added to solve

	dependencies if we can't accept the package selection because of
	limited disk space (#222894)

	* yuminstall.py (_undoDepInstalls): new method to remove transaction
	members that are only there because something depends on them

2 files changed, 17 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index fbda6b7b1..751a59c36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-16  Dave Lehman  <dlehman@redhat.com>
+
+	* yuminstall.py (doPostSelection): remove packages added to solve 
+	dependencies if we can't accept the package selection because of 
+	limited disk space (#222894)
+
+	* yuminstall.py (_undoDepInstalls): new method to remove transaction
+	members that are only there because something depends on them
+
 2007-01-16  Peter Jones  <pjones@redhat.com>
 
 	* yuminstall.py (YumSorter.__init__): make yum use anaconda's loggers.
diff --git a/yuminstall.py b/yuminstall.py
index 315656294..9b93d96ee 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -380,6 +380,12 @@ class YumSorter(yum.YumBase):
             return best
         return None
 
+    def _undoDepInstalls(self):
+        # clean up after ourselves in the case of failures
+        for txmbr in self.tsInfo:
+            if txmbr.isDep:
+                self.tsInfo.remove(txmbr.pkgtup)
+
     def prof_resolveDeps(self):
         fn = "anaconda.prof.0"
         import hotshot, hotshot.stats
@@ -455,7 +461,7 @@ class YumSorter(yum.YumBase):
                         found = True
                         break
                 if not found:
-                    txmbr.setAsDep(member.po)
+                    member.setAsDep(txmbr.po)
 
         return unresolved
 
@@ -1157,6 +1163,7 @@ class YumBackend(AnacondaBackend):
                     if rc == 1:
                         sys.exit(1)
                     else:
+                        self.ayum._undoDepInstalls()
                         return DISPATCH_BACK
         finally:
             dscb.pop()