summaryrefslogtreecommitdiffstats
path: root/packages.py
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-07-16 03:23:20 +0000
committerJeremy Katz <katzj@redhat.com>2003-07-16 03:23:20 +0000
commita51764f258d46a2e2f0ae39f25144c6ffabb8804 (patch)
tree18980a7ca91a86f6432dd19e172608ed7c12e8f1 /packages.py
parent1b2f9fe18937b9f187b7fd77a50c2c7d0f369654 (diff)
downloadanaconda-a51764f258d46a2e2f0ae39f25144c6ffabb8804.tar.gz
anaconda-a51764f258d46a2e2f0ae39f25144c6ffabb8804.tar.xz
anaconda-a51764f258d46a2e2f0ae39f25144c6ffabb8804.zip
merge from taroon branch. product.img stuff, md can be modular, lots of
little things across the board
Diffstat (limited to 'packages.py')
-rw-r--r--packages.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/packages.py b/packages.py
index 614597bbf..52d056af6 100644
--- a/packages.py
+++ b/packages.py
@@ -238,7 +238,7 @@ def getAnacondaTS(instPath = None):
# set color if needed. FIXME: why isn't this the default :/
if (rhpl.arch.canonArch.startswith("ppc64") or
- rhpl.arch.canonArch in ("s390x", "sparc64", "x86_64")):
+ rhpl.arch.canonArch in ("s390x", "sparc64", "x86_64", "ia64")):
ts.setColor(3)
return ts
@@ -1190,6 +1190,11 @@ def copyExtraModules(instPath, grpset, extraModules):
pattern = ""
names = ""
for (n, tag) in kernelVersions:
+ if tag == "up":
+ pkg = "kernel"
+ else:
+ pkg = "kernel-%s" %(tag,)
+ arch = grpset.hdrlist[pkg][rpm.RPMTAG_ARCH]
# version 1 path
pattern = pattern + " %s/%s/%s.o " % (n, arch, name)
# version 0 path