[Aptitude-svn-commit] r3416 - in branches/aptitude-0.3/aptitude: . src/generic

[Daniel Burrows]

Author: dburrows
Date: Thu Jun 23 00:31:01 2005
New Revision: 3416

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
Log:
Disable auto-installation of dependencies when restoring package states.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Thu Jun 23 00:31:01 2005
@@ -1,3 +1,13 @@
+2005-06-22  Daniel Burrows  <dburrows@debian.org>
+
+	* src/generic/aptcache.cc:
+
+	  Disable auto-installation of dependencies when restoring package
+	  states, to make sure we reproduce the state the user expects and
+	  to avoid ordering bugs (my goodness, how did this big gaping
+	  monster manage to avoid detection for so long?).
+	  Closes: #315359
+
 2005-06-22 Luk Claes <luk@debian.org>
 
 	* Updated Dutch translation

Modified: branches/aptitude-0.3/aptitude/src/generic/aptcache.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/aptcache.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/aptcache.cc	Thu Jun 23 00:31:01 2005
@@ -354,19 +354,19 @@
 		if(ver.VerStr()==estate.candver)
 		  {
 		    SetCandidateVersion(ver);
-		    MarkInstall(ver.ParentPkg());
+		    MarkInstall(ver.ParentPkg(), false);
 		    break;
 		  }
 	    }
 	  else
 	    if(i.CurrentVer().end())
-	      MarkInstall(i);
+	      MarkInstall(i, false);
 	    else
 	      {
 		SetReInstall(i, estate.reinstall);
 
 		if(estate.upgrade && state.Upgradable())
-		  MarkInstall(i);
+		  MarkInstall(i, false);
 	      }
 	  break;
 	case pkgCache::State::Hold: