2 files changed, 5 insertions, 2 deletions
diff --git a/comps.py b/comps.py
index 4bca0e7fe..37d1bfc0f 100644
--- a/comps.py
+++ b/comps.py
@@ -116,7 +116,10 @@ class HeaderList:
         self.hdlist = hdlist
 	self.packages = {}
 	newCompat = []
+        self.preordered = 1
 	for h in hdlist:
+            if h[1000003] == None:
+                self.preordered = 0
 	    name = h[rpm.RPMTAG_NAME]
             if noscore:
                 self.packages[name] = Package(h)
diff --git a/todo.py b/todo.py
index 5fdac6723..e85ad32d8 100644
--- a/todo.py
+++ b/todo.py
@@ -1618,8 +1618,8 @@ class ToDo:
             total = total + 1
             totalSize = totalSize + (p[rpm.RPMTAG_SIZE] / 1024 )
 
-        # XXX I've inserted them in order already.
-        # ts.order()
+        if not self.hdList.preordered:
+            ts.order()
 
         if self.upgrade:
             logname = '/tmp/upgrade.log'