Bug 636697

Description of problem:
I've just discovered that mash does not include packages without a koji 
build despite the fact that a RPM has been imported (koji import 
--create-build [package]). Mash seems to complain because there is no SRPM associated to the package/RPM. Saying sources=false in the repository config doesn't help. See code below.


Version-Release number of selected component (if applicable):
- mash 0.5.17
- koji 1.4.0


How reproducible:
Always reproducible. Import an RPM without any SRPM (and obviously no build) into koji. Then try to mash the repository containing this RPM (already packaged by a 3rd party).


Steps to Reproduce:
1. koji add-tag --owner=you yourrepo packagename
2. koji import --create-build packagename-1.0.0-1.noarch.rpm
3. koji tag-pkg yourepo packagename-1.0.0
4. mash yourrepo


Actual results:
mash throws an exception and exit.
# koji tag-pkg repoX package-17.00-00
# mash repoX
2010-09-22 11:14:40 mash: Getting package lists for repoX...
2010-09-22 11:14:40 mash: Sorting packages...
Traceback (most recent call last):
   File "/usr/bin/mash", line 97, in ?
     main()
   File "/usr/bin/mash", line 77, in main
     rc = themash.doCompose()
   File "/usr/lib/python2.4/site-packages/mash/__init__.py", line 339, 
in doCompose
     srcpkg = src_hash[pkg['build_id']]
KeyError: 389
mash failed in /var/tmp/mash/repoX


Expected results:
mash should work properly and the RPM without build _and_ without SRPM is listed in the generated mash repository.


Additional info:
The issue of bug can be found in mash/__init__.py around line 335. Indeed src_hash does not contain a hash (the package key) for the pkg without SRPM (srcpkg = src_hash[pkg['build_id']]). Later in the code, you do a test to see if there is a SRPM but we never reach this state (fn = _get_reference(srcpkg, builds_hash)). This snippet below should be slighty redone but sadly I've reached my python skills limits so I can't really help anymore. Sorry.

        src_hash = dict([(x['build_id'],x) for x in source.packages()])
        excludearch = dict([(x['build_id'],'') for x in source.packages()])
        exclusivearch = excludearch.copy()
        # Get excludearch/exclusivearch lists for noarch packages
        for pkg in noarch.packages():
            # TOM DEBUG
            self.logger.info("buildid=%s, srcpkg=%s" % (pkg['build_id'],src_hash[pkg['build_id']]) )
            srcpkg = src_hash[pkg['build_id']]
            self.logger.debug("Checking %s for Exclude/ExclusiveArch" % (nevra(pkg),))
            fn = _get_reference(srcpkg, builds_hash)
            # if build has no source rpm, check the binary
            if fn == None:
                fn = _get_reference(pkg, builds_hash)
            try:
                hdr = koji.get_rpm_header(fn)
            except:
                self.logger.error("Couldn't read header from %s (%s)" % (nevra(pkg), fn))
                if fn:
                    fn.close()
                continue
            excludearch[pkg['build_id']] = hdr['EXCLUDEARCH']
            exclusivearch[pkg['build_id']] = hdr['EXCLUSIVEARCH']
            fn.close()

Thanks
Thomas