merge from taroon branch to HEAD. mostly the package stuff, but also

msw's ctrl-alt-del thing and some arch fixups

1 files changed, 10 insertions, 6 deletions

diff --git a/comps.py b/comps.py
index 9b2aad4e9..89475313c 100644
--- a/comps.py
+++ b/comps.py
@@ -196,7 +196,11 @@ class HeaderList:
                 preordered = 0
         return preordered
 
-    def __init__(self, hdlist, compatPackages = None, noscore = 0):
+    # JKFIXME: prunePPCKernels is an awful hack to let us do something
+    # with kernel-iseries and kernel-pseries and still be able to get
+    # both of them for the pkgorder file.  
+    def __init__(self, hdlist, compatPackages = None, noscore = 0,
+                 prunePPCKernels = 1):
         self.hdlist = hdlist
 	self.packages = {}
 	newCompat = []
@@ -206,14 +210,14 @@ class HeaderList:
 
             # we should only keep kernel-pseries and kernel-iseries on
             # the appropriate machine
-            if name == "kernel-pseries" and iutil.getPPCMachine() != "pSeries":
+            if prunePPCKernels and name == "kernel-pseries" and iutil.getPPCMachine() != "pSeries":
                 continue
-            if name == "kernel-iseries" and iutil.getPPCMachine() != "iSeries":
+            if prunePPCKernels and name == "kernel-iseries" and iutil.getPPCMachine() != "iSeries":
                 continue
 
             # FIXME: this is a really bad hack so that we can try to avoid
             # weirdness with kernel packages
-            if name == "kernel-iseries" or name == "kernel-pseries":
+            if prunePPCKernels and (name == "kernel-iseries" or name == "kernel-pseries"):
                 self.packages["kernel"] = Package(h)
             
             if noscore:
@@ -240,10 +244,10 @@ class HeaderList:
 
 class HeaderListFromFile (HeaderList):
 
-    def __init__(self, path, compatPackages = None, noscore = 0):
+    def __init__(self, path, compatPackages = None, noscore = 0, prunePPCKernels = 1):
 	hdlist = rpm.readHeaderListFromFile(path)
 	HeaderList.__init__(self, hdlist, compatPackages = compatPackages,
-			    noscore = noscore)
+			    noscore = noscore, prunePPCKernels = prunePPCKernels)
 
 class HeaderListFD (HeaderList):
     def __init__(self, fd):