ordering problems

diff --git a/testsuite/solver/data.deptestomatic/basic-exercises/exercise-42-test.solution b/testsuite/solver/data.deptestomatic/basic-exercises/exercise-42-test.solution
index 9f60e0c..f008cef 100644 (file)
--- a/testsuite/solver/data.deptestomatic/basic-exercises/exercise-42-test.solution
+++ b/testsuite/solver/data.deptestomatic/basic-exercises/exercise-42-test.solution
@@ -1,128 +1,128 @@
 >!> Installing GConf2 from channel gnome2snaps
 >!> 23 problems found:
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for eel2-1.1.7.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for bug-buddy2-1:2.1.3.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete eel2
->!>       delete [package]eel2-1.1.7.0.200203140655-snap.ximian.1.noarch
+>!>       delete bug-buddy2
+>!>       delete [package]bug-buddy2-1:2.1.3.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for gnome-terminal-1.9.1.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for control-center2-1:1.99.4.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete gnome-terminal
->!>       delete [package]gnome-terminal-1.9.1.0.200203140655-snap.ximian.1.noarch
+>!>       delete control-center2
+>!>       delete [package]control-center2-1:1.99.4.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for gedit2-1:1.115.0.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for eel2-1.1.7.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete gedit2
->!>       delete [package]gedit2-1:1.115.0.0.200203140655-snap.ximian.1.noarch
+>!>       delete eel2
+>!>       delete [package]eel2-1.1.7.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for gnome-desktop-1.5.12.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for eog2-1:0.114.0.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete gnome-desktop
->!>       delete [package]gnome-desktop-1.5.12.0.200203140655-snap.ximian.1.noarch
+>!>       delete eog2
+>!>       delete [package]eog2-1:0.114.0.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for nautilus2-1.1.9.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for gdm2-1:2.3.90.1.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete nautilus2
->!>       delete [package]nautilus2-1.1.9.0.200203140655-snap.ximian.1.noarch
+>!>       delete gdm2
+>!>       delete [package]gdm2-1:2.3.90.1.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for gnome-panel-1.5.13.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for gedit2-1:1.115.0.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete gnome-panel
->!>       delete [package]gnome-panel-1.5.13.0.200203140655-snap.ximian.1.noarch
+>!>       delete gedit2
+>!>       delete [package]gedit2-1:1.115.0.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for gnome-panel-libs-1.5.13.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for gnome-applets2-1:1.96.0.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete gnome-panel-libs
->!>       delete [package]gnome-panel-libs-1.5.13.0.200203140655-snap.ximian.1.noarch
+>!>       delete gnome-applets2
+>!>       delete [package]gnome-applets2-1:1.96.0.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for libbonoboui-1.112.1.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for gnome-desktop-1.5.12.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete libbonoboui
->!>       delete [package]libbonoboui-1.112.1.0.200203140655-snap.ximian.1.noarch
+>!>       delete gnome-desktop
+>!>       delete [package]gnome-desktop-1.5.12.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for gdm2-1:2.3.90.1.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for gnome-desktop-libs-1.5.12.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete gdm2
->!>       delete [package]gdm2-1:2.3.90.1.0.200203140655-snap.ximian.1.noarch
+>!>       delete gnome-desktop-libs
+>!>       delete [package]gnome-desktop-libs-1.5.12.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for gnome-utils2-1:1.101.0.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for gnome-games2-1:1.90.2.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete gnome-utils2
->!>       delete [package]gnome-utils2-1:1.101.0.0.200203140655-snap.ximian.1.noarch
+>!>       delete gnome-games2
+>!>       delete [package]gnome-games2-1:1.90.2.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for gnome-vfs2-1.9.9.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for gnome-media2-1.176.0.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete gnome-vfs2
->!>       delete [package]gnome-vfs2-1.9.9.0.200203140655-snap.ximian.1.noarch
+>!>       delete gnome-media2
+>!>       delete [package]gnome-media2-1.176.0.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for gnome-applets2-1:1.96.0.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for gnome-panel-1.5.13.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete gnome-applets2
->!>       delete [package]gnome-applets2-1:1.96.0.0.200203140655-snap.ximian.1.noarch
+>!>       delete gnome-panel
+>!>       delete [package]gnome-panel-1.5.13.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for bug-buddy2-1:2.1.3.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for gnome-panel-libs-1.5.13.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete bug-buddy2
->!>       delete [package]bug-buddy2-1:2.1.3.0.200203140655-snap.ximian.1.noarch
+>!>       delete gnome-panel-libs
+>!>       delete [package]gnome-panel-libs-1.5.13.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for gnome-media2-1.176.0.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for gnome-session-1.5.11.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete gnome-media2
->!>       delete [package]gnome-media2-1.176.0.0.200203140655-snap.ximian.1.noarch
+>!>       delete gnome-session
+>!>       delete [package]gnome-session-1.5.11.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
@@ -136,74 +136,74 @@
 >!>       Ignore this requirement just here
 >!>       
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for eog2-1:0.114.0.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for gnome-terminal-1.9.1.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete eog2
->!>       delete [package]eog2-1:0.114.0.0.200203140655-snap.ximian.1.noarch
+>!>       delete gnome-terminal
+>!>       delete [package]gnome-terminal-1.9.1.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for nautilus-gtkhtml-0.3.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for gnome-utils2-1:1.101.0.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete nautilus-gtkhtml
->!>       delete [package]nautilus-gtkhtml-0.3.0.200203140655-snap.ximian.1.noarch
+>!>       delete gnome-utils2
+>!>       delete [package]gnome-utils2-1:1.101.0.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for gnome-games2-1:1.90.2.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for gnome-vfs2-1.9.9.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete gnome-games2
->!>       delete [package]gnome-games2-1:1.90.2.0.200203140655-snap.ximian.1.noarch
+>!>       delete gnome-vfs2
+>!>       delete [package]gnome-vfs2-1.9.9.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for gnome-desktop-libs-1.5.12.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for libbonoboui-1.112.1.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete gnome-desktop-libs
->!>       delete [package]gnome-desktop-libs-1.5.12.0.200203140655-snap.ximian.1.noarch
+>!>       delete libbonoboui
+>!>       delete [package]libbonoboui-1.112.1.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for libgnomeui-1.112.1.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for libgnome-1.112.1.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete libgnomeui
->!>       delete [package]libgnomeui-1.112.1.0.200203140655-snap.ximian.1.noarch
+>!>       delete libgnome
+>!>       delete [package]libgnome-1.112.1.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for control-center2-1:1.99.4.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for libgnomeui-1.112.1.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete control-center2
->!>       delete [package]control-center2-1:1.99.4.0.200203140655-snap.ximian.1.noarch
+>!>       delete libgnomeui
+>!>       delete [package]libgnomeui-1.112.1.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for libgnome-1.112.1.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for nautilus-gtkhtml-0.3.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete libgnome
->!>       delete [package]libgnome-1.112.1.0.200203140655-snap.ximian.1.noarch
+>!>       delete nautilus-gtkhtml
+>!>       delete [package]nautilus-gtkhtml-0.3.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
 >!> Problem:
->!> Can't satisfy requirement libgconf-2.so.4 for gnome-session-1.5.11.0.200203140655-snap.ximian.1.noarch
+>!> Can't satisfy requirement libgconf-2.so.4 for nautilus2-1.1.9.0.200203140655-snap.ximian.1.noarch
 >!> 
 >!>    Solution:
->!>       delete gnome-session
->!>       delete [package]gnome-session-1.5.11.0.200203140655-snap.ximian.1.noarch
+>!>       delete nautilus2
+>!>       delete [package]nautilus2-1.1.9.0.200203140655-snap.ximian.1.noarch
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       

diff --git a/testsuite/solver/src/deptestomatic.cc b/testsuite/solver/src/deptestomatic.cc
index 469d5fd..0f2d20c 100644 (file)
--- a/testsuite/solver/src/deptestomatic.cc
+++ b/testsuite/solver/src/deptestomatic.cc
@@ -106,6 +106,14 @@ typedef set<PoolItem_Ref> PoolItemSet;
 #define MARKER ">!> "
 #define RESULT cout << MARKER
 
+
+class compare_problems {
+public:
+    int operator() (const boost::intrusive_ptr<zypp::ResolverProblem> & p1,
+                    const boost::intrusive_ptr<zypp::ResolverProblem> & p2) const
+        { return p1->description() < p2->description(); }
+};
+
 //-----------------------------------------------------------------------------
 
 static std::ostream &
@@ -1273,6 +1281,7 @@ parse_xml_trial (XmlNode_Ptr node, const ResPool & pool)
            }
            else {
                ResolverProblemList problems = resolver->problems ();
+                problems.sort(compare_problems());
                RESULT << problems.size() << " problems found:" << endl;
                for (ResolverProblemList::iterator iter = problems.begin(); iter != problems.end(); ++iter) {
                     ResolverProblem problem = **iter;