[paludis-commits] r4589 - in trunk: . paludis

[ciaranm at svn.pioto.org]

Author: ciaranm
Date: 2008-04-21 01:00:16 +0000 (Mon, 21 Apr 2008)
New Revision: 4589

Modified:
   trunk/ChangeLog
   trunk/paludis/install_task.cc
Log:
Fix continue-on-failure + resume command. Fixes: ticket:557


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-04-20 17:50:46 UTC (rev 4588)
+++ trunk/ChangeLog	2008-04-21 01:00:16 UTC (rev 4589)
@@ -5,6 +5,12 @@
 only listed in SVN log. For a summary of what has changed between releases,
 see the NEWS file. This file is occasionally pruned to ChangeLog.old.bz2.
 
+2008-04-21 Ciaran McCreesh
+
+	* paludis/install_task.cc: Fix continue-on-failure + resume command.
+
+	+ Fixes: ticket:557
+
 2008-04-20 David Leverton
 
 	* src/clients/reconcilio/: Remove --verbose option from

Modified: trunk/paludis/install_task.cc
===================================================================
--- trunk/paludis/install_task.cc	2008-04-20 17:50:46 UTC (rev 4588)
+++ trunk/paludis/install_task.cc	2008-04-21 01:00:16 UTC (rev 4589)
@@ -303,12 +303,18 @@
 
         void visit(const DepListEntryHandledSkippedUnsatisfied & s)
         {
-            result = "U" + stringify(s.spec());
+            if (undo_failures)
+                result = "P";
+            else
+                result = "U" + stringify(s.spec());
         }
 
         void visit(const DepListEntryHandledSkippedDependent & s)
         {
-            result = "D=" + stringify(*s.id());
+            if (undo_failures)
+                result = "P";
+            else
+                result = "D=" + stringify(*s.id());
         }
     };
 }