[Fedora-livecd-list] make_initrds functions: duplicates

[Chitlesh GOORAH]

Hello,

In kadischi.py, in make_initrds, the if_and_else statements are the same.
Did we miss something while copy-pasting ?

def make_initrds(sysdir, bindir):
    clear_rpm_db_files(sysdir)
    ts = rpm.TransactionSet(sysdir)
    global kernel, kernel_smp
    kernel = None
    kernel_smp = None
    if isys.smpAvailable() or isys.htavailable():
        for mi in ts.dbMatch('name', 'kernel'):
            kernel = "%s-%s" % (mi['version'], mi['release'])
        for mi in ts.dbMatch('name', 'kernel-smp'):
            kernel_smp = "%s-%s" % (mi['version'], mi['release']) + 'smp'

        if kernel != None and kernel_smp != None:
            os.system("%s/livecd-mkinitrd.sh %s %s" % (bindir, sysdir, kernel))
            os.system("%s/livecd-mkinitrd.sh %s %s" % (bindir, sysdir,
kernel_smp))
        elif kernel != None and kernel_smp == None:
            os.system("%s/livecd-mkinitrd.sh %s %s" % (bindir, sysdir, kernel))
        elif kernel == None and kernel_smp != None:
            os.system("%s/livecd-mkinitrd.sh %s %s" % (bindir, sysdir,
kernel_smp))
        else:
            print >> sys.stderr, "\n\n[kadischi]: Couldn't determine
kernel version!"
            print >> sys.stderr, "[kadischi]: Kadischi fails."
            sys.exit(1)
    else:
        for mi in ts.dbMatch('name', 'kernel'):
            kernel = "%s-%s" % (mi['version'], mi['release'])
        for mi in ts.dbMatch('name', 'kernel-smp'):
            kernel_smp = "%s-%s" % (mi['version'], mi['release']) + 'smp'

        if kernel != None and kernel_smp != None:
            os.system("%s/livecd-mkinitrd.sh %s %s" % (bindir, sysdir, kernel))
            os.system("%s/livecd-mkinitrd.sh %s %s" % (bindir, sysdir,
kernel_smp))
        elif kernel != None and kernel_smp == None:
            os.system("%s/livecd-mkinitrd.sh %s %s" % (bindir, sysdir, kernel))
        elif kernel == None and kernel_smp != None:
            os.system("%s/livecd-mkinitrd.sh %s %s" % (bindir, sysdir,
kernel_smp))
        else:
            print >> sys.stderr, "\n\n[kadischi]: Couldn't determine
kernel version!"
            print >> sys.stderr, "[kadischi]: Kadischi fails."
            sys.exit(1)

    clear_rpm_db_files(sysdir)

Chitlesh
-- 
http://clunixchit.blogspot.com