diff --git a/Makefile b/Makefile

index 60bb9db..0b5738b 100644

--- a/Makefile

+++ b/Makefile

@@ -1,4 +1,5 @@

 PKGNAME = createrepo

+ALIASES = mergerepo modifyrepo genpkgmetadata.py mergerepo.py modifyrepo.py

 VERSION=$(shell awk '/Version:/ { print $$2 }' ${PKGNAME}.spec)

 RELEASE=$(shell awk '/Release:/ { print $$2 }' ${PKGNAME}.spec)

 CVSTAG=createrepo-$(subst .,_,$(VERSION)-$(RELEASE))

@@ -26,6 +27,8 @@ docdir =

 includedir = ${prefix}/include

 oldincludedir = /usr/include

 mandir = ${prefix}/share/man

+compdir = $(shell pkg-config --variable=completionsdir bash-completion)

+compdir := $(or $(compdir), "/etc/bash_completion.d")

 pkgdatadir = $(datadir)/$(PKGNAME)

 pkglibdir = $(libdir)/$(PKGNAME)

@@ -33,7 +36,7 @@ pkgincludedir = $(includedir)/$(PKGNAME)

 top_builddir = 

 # all dirs

-DIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(sysconfdir)/bash_completion.d \

+DIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(compdir) \

 	$(DESTDIR)$(pkgdatadir) $(DESTDIR)$(mandir)

@@ -65,7 +68,8 @@ check:

 install: all installdirs

 	$(INSTALL_MODULES) $(srcdir)/$(MODULES) $(DESTDIR)$(pkgdatadir)

-	$(INSTALL_DATA) $(PKGNAME).bash $(DESTDIR)$(sysconfdir)/bash_completion.d

+	$(INSTALL_DATA) $(PKGNAME).bash $(DESTDIR)$(compdir)/$(PKGNAME)

+	(cd $(DESTDIR)$(compdir); for n in $(ALIASES); do ln -s $(PKGNAME) $$n; done)

 	for subdir in $(SUBDIRS) ; do \

 	  $(MAKE) -C $$subdir install VERSION=$(VERSION) PKGNAME=$(PKGNAME); \

 	done

diff --git a/createrepo.bash b/createrepo.bash

index 54ac8b2..14b43d8 100644

--- a/createrepo.bash

+++ b/createrepo.bash

@@ -1,11 +1,22 @@

 # bash completion for createrepo and friends

+_cr_compress_type()

+{

+    COMPREPLY=( $( compgen -W "$( ${1:-createrepo} --compress-type=FOO / 2>&1 \

+        | sed -ne 's/,/ /g' -ne 's/.*[Cc]ompression.*://p' )" -- "$2" ) )

+}

+

+_cr_checksum_type()

+{

+    COMPREPLY=( $( compgen -W 'md5 sha1 sha256 sha512' -- "$1" ) )

+}

+

 _cr_createrepo()

 {

     COMPREPLY=()

     case $3 in

-        --version|-h|--help|-u|--baseurl|--distro|--content|--repo|--workers|\

+        --version|-h|--help|-u|--baseurl|--distro|--content|--repo|\

         --revision|-x|--excludes|--changelog-limit|--max-delta-rpm-size)

             return 0

             ;;

@@ -18,8 +29,8 @@ _cr_createrepo()

             COMPREPLY=( $( compgen -f -o plusdirs -X '!*.xml' -- "$2" ) )

             return 0

             ;;

-        -s|--sumtype)

-            COMPREPLY=( $( compgen -W 'md5 sha1 sha256 sha512' -- "$2" ) )

+        -s|--checksum)

+            _cr_checksum_type "$2"

             return 0

             ;;

         -i|--pkglist|--read-pkgs-list)

@@ -30,10 +41,24 @@ _cr_createrepo()

             COMPREPLY=( $( compgen -f -o plusdirs -X '!*.rpm' -- "$2" ) )

             return 0

             ;;

+        --retain-old-md)

+            COMPREPLY=( $( compgen -W '0 1 2 3 4 5 6 7 8 9' -- "$2" ) )

+            return 0

+            ;;

         --num-deltas)

             COMPREPLY=( $( compgen -W '1 2 3 4 5 6 7 8 9' -- "$2" ) )

             return 0

             ;;

+        --workers)

+            local min=2 max=$( getconf _NPROCESSORS_ONLN 2>/dev/null )

+            [[ -z $max || $max -lt $min ]] && max=$min

+            COMPREPLY=( $( compgen -W "{1..$max}" -- "$2" ) )

+            return 0

+            ;;

+        --compress-type)

+            _cr_compress_type "$1" "$2"

+            return 0

+            ;;

     esac

     if [[ $2 == -* ]] ; then

@@ -42,9 +67,9 @@ _cr_createrepo()

             --cachedir --checkts --no-database --update --update-md-path

             --skip-stat --split --pkglist --includepkg --outputdir

             --skip-symlinks --changelog-limit --unique-md-filenames

-            --simple-md-filenames --distro --content --repo --revision --deltas

-            --oldpackagedirs --num-deltas --read-pkgs-list

-            --max-delta-rpm-size --workers' -- "$2" ) )

+            --simple-md-filenames --retain-old-md --distro --content --repo

+            --revision --deltas --oldpackagedirs --num-deltas --read-pkgs-list

+            --max-delta-rpm-size --workers --compress-type' -- "$2" ) )

     else

         COMPREPLY=( $( compgen -d -- "$2" ) )

     fi

@@ -63,10 +88,14 @@ _cr_mergerepo()

             COMPREPLY=( $( compgen -d -- "$2" ) )

             return 0

             ;;

+        --compress-type)

+            _cr_compress_type "" "$2"

+            return 0

+            ;;

     esac

     COMPREPLY=( $( compgen -W '--version --help --repo --archlist --no-database

-        --outputdir --nogroups --noupdateinfo' -- "$2" ) )

+        --outputdir --nogroups --noupdateinfo --compress-type' -- "$2" ) )

 } &&

 complete -F _cr_mergerepo -o filenames mergerepo mergerepo.py

@@ -78,17 +107,27 @@ _cr_modifyrepo()

         --version|-h|--help|--mdtype)

             return 0

             ;;

+        --compress-type)

+            _cr_compress_type "" "$2"

+            return 0

+            ;;

+        -s|--checksum)

+            _cr_checksum_type "$2"

+            return 0

+            ;;

     esac

     if [[ $2 == -* ]] ; then

-        COMPREPLY=( $( compgen -W '--version --help --mdtype' -- "$2" ) )

+        COMPREPLY=( $( compgen -W '--version --help --mdtype --remove

+            --compress --no-compress --compress-type --checksum

+            --unique-md-filenames --simple-md-filenames' -- "$2" ) )

         return 0

     fi

     local i argnum=1

     for (( i=1; i < ${#COMP_WORDS[@]}-1; i++ )) ; do

         if [[ ${COMP_WORDS[i]} != -* &&

-                    ${COMP_WORDS[i-1]} != @(=|--mdtype) ]]; then

+              ${COMP_WORDS[i-1]} != @(=|--@(md|compress-)type) ]]; then

             argnum=$(( argnum+1 ))

         fi

     done

diff --git a/createrepo.spec b/createrepo.spec

index 1e491cd..9a2179b 100644

--- a/createrepo.spec

+++ b/createrepo.spec

@@ -1,5 +1,17 @@

 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

+%if ! 0%{?rhel}

+# we don't have this in rhel yet...

+BuildRequires: bash-completion

+%endif

+

+# disable broken /usr/lib/rpm/brp-python-bytecompile

+%define __os_install_post %{nil}

+%define compdir %(pkg-config --variable=completionsdir bash-completion)

+%if "%{compdir}" == ""

+%define compdir "/etc/bash_completion.d"

+%endif

+

 Summary: Creates a common metadata repository

 Name: createrepo

 Version: 0.9.9

@@ -11,7 +23,7 @@ URL: http://createrepo.baseurl.org/

 BuildRoot: %{_tmppath}/%{name}-%{version}root

 BuildArchitectures: noarch

 Requires: python >= 2.1, rpm-python, rpm >= 0:4.1.1, libxml2-python

-Requires: yum-metadata-parser, yum >= 3.2.29, python-deltarpm

+Requires: yum-metadata-parser, yum >= 3.2.29, python-deltarpm, pyliblzma

 %description

 This utility will generate a common metadata repository from a directory of

@@ -32,7 +44,7 @@ make DESTDIR=$RPM_BUILD_ROOT sysconfdir=%{_sysconfdir} install

 %defattr(-, root, root)

 %dir %{_datadir}/%{name}

 %doc ChangeLog README COPYING COPYING.lib

-%{_sysconfdir}/bash_completion.d/

+%(dirname %{compdir})

 %{_datadir}/%{name}/*

 %{_bindir}/%{name}

 %{_bindir}/modifyrepo

@@ -43,6 +55,9 @@ make DESTDIR=$RPM_BUILD_ROOT sysconfdir=%{_sysconfdir} install

 %{python_sitelib}/createrepo

 %changelog

+* Fri Sep  9 2011 Seth Vidal <skvidal at fedoraproject.org>

+- add lzma dep

+

 * Wed Jan 26 2011 Seth Vidal <skvidal at fedoraproject.org>

 - bump to 0.9.9

 - add worker.py

diff --git a/createrepo/__init__.py b/createrepo/__init__.py

index 8f2538e..1b18a9f 100644

--- a/createrepo/__init__.py

+++ b/createrepo/__init__.py

@@ -26,15 +26,16 @@ import tempfile

 import stat

 import fcntl

 import subprocess

+from select import select

-from yum import misc, Errors, to_unicode

-from yum.repoMDObject import RepoMD, RepoMDError, RepoData

+from yum import misc, Errors

+from yum.repoMDObject import RepoMD, RepoData

 from yum.sqlutils import executeSQL

 from yum.packageSack import MetaSack

-from yum.packages import YumAvailablePackage, YumLocalPackage

+from yum.packages import YumAvailablePackage

 import rpmUtils.transaction

-from utils import _, errorprint, MDError

+from utils import _, errorprint, MDError, lzma, _available_compression

 import readMetadata

 try:

     import sqlite3 as sqlite

@@ -46,8 +47,9 @@ try:

 except ImportError:

     pass

-from utils import _gzipOpen, bzipFile, checkAndMakeDir, GzipFile, \

+from utils import _gzipOpen, compressFile, compressOpen, checkAndMakeDir, GzipFile, \

                   checksum_and_rename, split_list_into_equal_chunks

+from utils import num_cpus_online

 import deltarpms

 __version__ = '0.9.9'

@@ -74,7 +76,7 @@ class MetaDataConfig(object):

         self.deltadir = None

         self.delta_relative = 'drpms/'

         self.oldpackage_paths = [] # where to look for the old packages -

-        self.deltafile = 'prestodelta.xml.gz'

+        self.deltafile = 'prestodelta.xml'

         self.num_deltas = 1 # number of older versions to delta (max)

         self.max_delta_rpm_size = 100000000

         self.update_md_path = None

@@ -86,9 +88,9 @@ class MetaDataConfig(object):

         self.skip_symlinks = False

         self.pkglist = []

         self.database_only = False

-        self.primaryfile = 'primary.xml.gz'

-        self.filelistsfile = 'filelists.xml.gz'

-        self.otherfile = 'other.xml.gz'

+        self.primaryfile = 'primary.xml'

+        self.filelistsfile = 'filelists.xml'

+        self.otherfile = 'other.xml'

         self.repomdfile = 'repomd.xml'

         self.tempdir = '.repodata'

         self.finaldir = 'repodata'

@@ -108,8 +110,10 @@ class MetaDataConfig(object):

         self.collapse_glibc_requires = True

         self.workers = 1 # number of workers to fork off to grab metadata from the pkgs

         self.worker_cmd = '/usr/share/createrepo/worker.py'

-        

         #self.worker_cmd = './worker.py' # helpful when testing

+        self.retain_old_md = 0

+        self.compress_type = 'compat'

+

 class SimpleMDCallBack(object):

     def errorlog(self, thing):

@@ -141,10 +145,23 @@ class MetaDataGenerator:

         self.files = []

         self.rpmlib_reqs = {}

         self.read_pkgs = []

+        self.compat_compress = False

         if not self.conf.directory and not self.conf.directories:

             raise MDError, "No directory given on which to run."

-

+        

+        if self.conf.compress_type == 'compat':

+            self.compat_compress = True

+            self.conf.compress_type = None

+            

+        if not self.conf.compress_type:

+            self.conf.compress_type = 'gz'

+        

+        if self.conf.compress_type not in utils._available_compression:

+            raise MDError, "Compression %s not available: Please choose from: %s" \

+                 % (self.conf.compress_type, ', '.join(utils._available_compression))

+            

+            

         if not self.conf.directories: # just makes things easier later

             self.conf.directories = [self.conf.directory]

         if not self.conf.directory: # ensure we have both in the config object

@@ -290,14 +307,13 @@ class MetaDataGenerator:

         def extension_visitor(filelist, dirname, names):

             for fn in names:

+                fn = os.path.join(dirname, fn)

                 if os.path.isdir(fn):

                     continue

                 if self.conf.skip_symlinks and os.path.islink(fn):

                     continue

                 elif fn[-extlen:].lower() == '%s' % (ext):

-                    relativepath = dirname.replace(startdir, "", 1)

-                    relativepath = relativepath.lstrip("/")

-                    filelist.append(os.path.join(relativepath, fn))

+                    filelist.append(fn[len(startdir):])

         filelist = []

         startdir = directory + '/'

@@ -311,7 +327,7 @@ class MetaDataGenerator:

     def checkTimeStamps(self):

         """check the timestamp of our target dir. If it is not newer than

            the repodata return False, else True"""

-        if self.conf.checkts:

+        if self.conf.checkts and self.conf.mdtimestamp:

             dn = os.path.join(self.conf.basedir, self.conf.directory)

             files = self.getFileList(dn, '.rpm')

             files = self.trimRpms(files)

@@ -410,9 +426,11 @@ class MetaDataGenerator:

     def _setupPrimary(self):

         # setup the primary metadata file

+        # FIXME - make this be  conf.compress_type once y-m-p is fixed

+        fpz = self.conf.primaryfile + '.' + 'gz'

         primaryfilepath = os.path.join(self.conf.outputdir, self.conf.tempdir,

-                                       self.conf.primaryfile)

-        fo = _gzipOpen(primaryfilepath, 'w')

+                                       fpz)

+        fo = compressOpen(primaryfilepath, 'w', 'gz')

         fo.write('\n')

         fo.write('

             ' xmlns:rpm="http://linux.duke.edu/metadata/rpm" packages="%s">' %

@@ -421,9 +439,11 @@ class MetaDataGenerator:

     def _setupFilelists(self):

         # setup the filelist file

+        # FIXME - make this be  conf.compress_type once y-m-p is fixed        

+        fpz = self.conf.filelistsfile + '.' + 'gz'

         filelistpath = os.path.join(self.conf.outputdir, self.conf.tempdir,

-                                    self.conf.filelistsfile)

-        fo = _gzipOpen(filelistpath, 'w')

+                                    fpz)

+        fo = compressOpen(filelistpath, 'w', 'gz')

         fo.write('\n')

         fo.write('

                  ' packages="%s">' % self.pkgcount)

@@ -431,9 +451,11 @@ class MetaDataGenerator:

     def _setupOther(self):

         # setup the other file

+        # FIXME - make this be  conf.compress_type once y-m-p is fixed        

+        fpz = self.conf.otherfile + '.' + 'gz'

         otherfilepath = os.path.join(self.conf.outputdir, self.conf.tempdir,

-                                     self.conf.otherfile)

-        fo = _gzipOpen(otherfilepath, 'w')

+                                     fpz)

+        fo = compressOpen(otherfilepath, 'w', 'gz')

         fo.write('\n')

         fo.write('

                  ' packages="%s">' %

@@ -442,9 +464,10 @@ class MetaDataGenerator:

     def _setupDelta(self):

         # setup the other file

+        fpz = self.conf.deltafile + '.' + self.conf.compress_type        

         deltafilepath = os.path.join(self.conf.outputdir, self.conf.tempdir,

-                                     self.conf.deltafile)

-        fo = _gzipOpen(deltafilepath, 'w')

+                                     fpz)

+        fo = compressOpen(deltafilepath, 'w', self.conf.compress_type)

         fo.write('\n')

         fo.write('<prestodelta>\n')

         return fo

@@ -520,6 +543,7 @@ class MetaDataGenerator:

         # go on their merry way

         newpkgs = []

+        keptpkgs = []

         if self.conf.update:

             # if we're in --update mode then only act on the new/changed pkgs

             for pkg in pkglist:

@@ -530,39 +554,13 @@ class MetaDataGenerator:

                 old_pkg = pkg

                 if pkg.find("://") != -1:

                     old_pkg = os.path.basename(pkg)

-                nodes = self.oldData.getNodes(old_pkg)

-                if nodes is not None: # we have a match in the old metadata

+                old_po = self.oldData.getNodes(old_pkg)

+                if old_po: # we have a match in the old metadata

                     if self.conf.verbose:

                         self.callback.log(_("Using data from old metadata for %s")

                                             % pkg)

-                    (primarynode, filenode, othernode) = nodes

-

-                    for node, outfile in ((primarynode, self.primaryfile),

-                                          (filenode, self.flfile),

-                                          (othernode, self.otherfile)):

-                        if node is None:

-                            break

-

-                        if self.conf.baseurl:

-                            anode = node.children

-                            while anode is not None:

-                                if anode.type != "element":

-                                    anode = anode.next

-                                    continue

-                                if anode.name == "location":

-                                    anode.setProp('xml:base', self.conf.baseurl)

-                                anode = anode.next

-

-                        output = node.serialize('UTF-8', self.conf.pretty)

-                        if output:

-                            outfile.write(output)

-                        else:

-                            if self.conf.verbose:

-                                self.callback.log(_("empty serialize on write to" \

-                                                    "%s in %s") % (outfile, pkg))

-                        outfile.write('\n')

-

-                    self.oldData.freeNodes(pkg)

+                    keptpkgs.append((pkg, old_po))

+

                     #FIXME - if we're in update and we have deltas enabled

                     # check the presto data for this pkg and write its info back out

                     # to our deltafile

@@ -584,32 +582,45 @@ class MetaDataGenerator:

             po = None

             if isinstance(pkg, YumAvailablePackage):

                 po = pkg

-                self.read_pkgs.append(po.localpath)

+                self.read_pkgs.append(po.localPkg())

             # if we're dealing with remote pkgs - pitch it over to doing

             # them one at a time, for now. 

             elif pkg.find('://') != -1:

-                po = self.read_in_package(pkgfile, pkgpath=pkgpath, reldir=reldir)

+                po = self.read_in_package(pkg, pkgpath=pkgpath, reldir=reldir)

                 self.read_pkgs.append(pkg)

             if po:

-                self.primaryfile.write(po.xml_dump_primary_metadata())

-                self.flfile.write(po.xml_dump_filelists_metadata())

-                self.otherfile.write(po.xml_dump_other_metadata(

-                                     clog_limit=self.conf.changelog_limit))

+                keptpkgs.append((pkg, po))

                 continue

             pkgfiles.append(pkg)

-            

-       

+

+        keptpkgs.sort(reverse=True)

+        # keptkgs is a list of (filename, po), pkgfiles is a list if filenames.

+        # Need to write them in sorted(filename) order.  We loop over pkgfiles,

+        # inserting keptpkgs in right spots (using the upto argument).

+        def save_keptpkgs(upto):

+            while keptpkgs and (upto is None or keptpkgs[-1][0] < upto):

+                filename, po = keptpkgs.pop()

+                # reset baseurl in the old pkg

+                po.basepath = self.conf.baseurl

+                self.primaryfile.write(po.xml_dump_primary_metadata())

+                self.flfile.write(po.xml_dump_filelists_metadata())

+                self.otherfile.write(po.xml_dump_other_metadata(

+                    clog_limit=self.conf.changelog_limit))

+

         if pkgfiles:

             # divide that list by the number of workers and fork off that many

             # workers to tmpdirs

             # waitfor the workers to finish and as each one comes in

             # open the files they created and write them out to our metadata

             # add up the total pkg counts and return that value

-            worker_tmp_path = tempfile.mkdtemp()

-            worker_chunks = utils.split_list_into_equal_chunks(pkgfiles,  self.conf.workers)

+            self._worker_tmp_path = tempfile.mkdtemp() # setting this in the base object so we can clean it up later

+            if self.conf.workers < 1:

+                self.conf.workers = num_cpus_online()

+            pkgfiles.sort()

+            worker_chunks = split_list_into_equal_chunks(pkgfiles, self.conf.workers)

             worker_cmd_dict = {}

             worker_jobs = {}

             base_worker_cmdline = [self.conf.worker_cmd, 

@@ -617,7 +628,8 @@ class MetaDataGenerator:

                     '--pkgoptions=_collapse_libc_requires=%s' % self.conf.collapse_glibc_requires, 

                     '--pkgoptions=_cachedir=%s' % self.conf.cachedir,

                     '--pkgoptions=_baseurl=%s' % self.conf.baseurl,

-                    '--globalopts=clog_limit=%s' % self.conf.changelog_limit,]

+                    '--globalopts=clog_limit=%s' % self.conf.changelog_limit,

+                    '--globalopts=sumtype=%s' % self.conf.sumtype, ]

             if self.conf.quiet:

                 base_worker_cmdline.append('--quiet')

@@ -626,15 +638,14 @@ class MetaDataGenerator:

                 base_worker_cmdline.append('--verbose')

             for worker_num in range(self.conf.workers):

-                # make the worker directory

+                pkl = self._worker_tmp_path + '/pkglist-%s' % worker_num

+                f = open(pkl, 'w') 

+                f.write('\n'.join(worker_chunks[worker_num]))

+                f.close()

+                

                 workercmdline = []

                 workercmdline.extend(base_worker_cmdline)

-                thisdir = worker_tmp_path + '/' + str(worker_num)

-                if checkAndMakeDir(thisdir):

-                    workercmdline.append('--tmpmdpath=%s' % thisdir)

-                else:

-                    raise MDError, "Unable to create worker path: %s" % thisdir

-                workercmdline.extend(worker_chunks[worker_num])

+                workercmdline.append('--pkglist=%s/pkglist-%s' % (self._worker_tmp_path, worker_num))

                 worker_cmd_dict[worker_num] = workercmdline

@@ -647,49 +658,60 @@ class MetaDataGenerator:

                                         stderr=subprocess.PIPE)

                 worker_jobs[num] = job

-            gimmebreak = 0

-            while gimmebreak != len(worker_jobs.keys()):

-                gimmebreak = 0

-                for (num,job) in worker_jobs.items():

-                    if job.poll() is not None:

-                        gimmebreak+=1

-                    line = job.stdout.readline()

-                    if line:

+            files = self.primaryfile, self.flfile, self.otherfile

+            def log_messages(num):

+                job = worker_jobs[num]

+                while True:

+                    # check stdout and stderr

+                    for stream in select((job.stdout, job.stderr), (), ())[0]:

+                        line = stream.readline()

+                        if line: break

+                    else:

+                        return # EOF, EOF

+                    if stream is job.stdout:

+                        if line.startswith('*** '):

+                            # get data, save to local files

+                            for out, size in zip(files, line[4:].split()):

+                                out.write(stream.read(int(size)))

+                            return

                         self.callback.log('Worker %s: %s' % (num, line.rstrip()))

-                    line = job.stderr.readline()

-                    if line:

+                    else:

                         self.callback.errorlog('Worker %s: %s' % (num, line.rstrip()))

+

+            for i, pkg in enumerate(pkgfiles):

+                # insert cached packages

+                save_keptpkgs(pkg)

+

+                # save output to local files

+                log_messages(i % self.conf.workers)

+

+            for (num, job) in worker_jobs.items():

+                # process remaining messages on stderr

+                log_messages(num)

+

+                if job.wait() != 0:

+                    msg = "Worker exited with non-zero value: %s. Fatal." % job.returncode

+                    self.callback.errorlog(msg)

+                    raise MDError, msg

-                

             if not self.conf.quiet:

                 self.callback.log("Workers Finished")

-            # finished with workers

-            # go to their dirs and add the contents

-            if not self.conf.quiet:

-                self.callback.log("Gathering worker results")

-            for num in range(self.conf.workers):

-                for (fn, fo) in (('primary.xml', self.primaryfile), 

-                           ('filelists.xml', self.flfile),

-                           ('other.xml', self.otherfile)):

-                    fnpath = worker_tmp_path + '/' + str(num) + '/' + fn

-                    if os.path.exists(fnpath):

-                        fo.write(open(fnpath, 'r').read())

-

             for pkgfile in pkgfiles:

                 if self.conf.deltas:

-                    po = self.read_in_package(pkgfile, pkgpath=pkgpath, reldir=reldir)

-                    self._do_delta_rpm_package(po)

+                    try:

+                        po = self.read_in_package(pkgfile, pkgpath=pkgpath, reldir=reldir)

+                        self._do_delta_rpm_package(po)

+                    except MDError, e:

+                        errorprint(e)

+                        continue

                 self.read_pkgs.append(pkgfile)

+        save_keptpkgs(None) # append anything left

         return self.current_pkg

     def closeMetadataDocs(self):

-        if not self.conf.quiet:

-            self.callback.log('')

-

-

         # save them up to the tmp locations:

         if not self.conf.quiet:

             self.callback.log(_('Saving Primary metadata'))

@@ -784,7 +806,6 @@ class MetaDataGenerator:

             return self._old_package_dict

         self._old_package_dict = {}

-        opl = []

         for d in self.conf.oldpackage_paths:

             for f in self.getFileList(d, '.rpm'):

                 fp = d + '/' + f

@@ -833,7 +854,7 @@ class MetaDataGenerator:

         return ' '.join(results)

     def _createRepoDataObject(self, mdfile, mdtype, compress=True, 

-                              compress_type='gzip', attribs={}):

+                              compress_type=None, attribs={}):

         """return random metadata as RepoData object to be  added to RepoMD

            mdfile = complete path to file

            mdtype = the metadata type to use

@@ -843,15 +864,13 @@ class MetaDataGenerator:

         sfile = os.path.basename(mdfile)

         fo = open(mdfile, 'r')

         outdir = os.path.join(self.conf.outputdir, self.conf.tempdir)

+        if not compress_type:

+            compress_type = self.conf.compress_type

         if compress:

-            if compress_type == 'gzip':

-                sfile = '%s.gz' % sfile

-                outfn = os.path.join(outdir, sfile)

-                output = GzipFile(filename = outfn, mode='wb')

-            elif compress_type == 'bzip2':

-                sfile = '%s.bz2' % sfile

-                outfn = os.path.join(outdir, sfile)

-                output = BZ2File(filename = outfn, mode='wb')

+            sfile = '%s.%s' % (sfile, compress_type)

+            outfn = os.path.join(outdir, sfile)

+            output = compressOpen(outfn, mode='wb', compress_type=compress_type)

+                

         else:

             outfn  = os.path.join(outdir, sfile)

             output = open(outfn, 'w')

@@ -874,14 +893,13 @@ class MetaDataGenerator:

         thisdata = RepoData()

         thisdata.type = mdtype

-        baseloc = None

         thisdata.location = (self.conf.baseurl, os.path.join(self.conf.finaldir, sfile))

         thisdata.checksum = (self.conf.sumtype, csum)

         if compress:

             thisdata.openchecksum  = (self.conf.sumtype, open_csum)

         thisdata.size = str(os.stat(outfn).st_size)

-        thisdata.timestamp = str(os.stat(outfn).st_mtime)

+        thisdata.timestamp = str(int(os.stat(outfn).st_mtime))

         for (k, v) in attribs.items():

             setattr(thisdata, k, str(v))

@@ -925,9 +943,14 @@ class MetaDataGenerator:

             rp = sqlitecachec.RepodataParserSqlite(repopath, repomd.repoid, None)

         for (rpm_file, ftype) in workfiles:

+            # when we fix y-m-p and non-gzipped xml files - then we can make this just add

+            # self.conf.compress_type

+            if ftype in ('other', 'filelists', 'primary'):

+                rpm_file = rpm_file + '.' + 'gz'

+            elif rpm_file.find('.') != -1 and rpm_file.split('.')[-1] not in _available_compression:

+                rpm_file = rpm_file + '.' + self.conf.compress_type

             complete_path = os.path.join(repopath, rpm_file)

-

-            zfo = _gzipOpen(complete_path)

+            zfo = compressOpen(complete_path)

             # This is misc.checksum() done locally so we can get the size too.

             data = misc.Checksums([sumtype])

             while data.read(zfo, 2**16):

@@ -966,14 +989,20 @@ class MetaDataGenerator:

                     good_name = '%s.sqlite' % ftype

                     resultpath = os.path.join(repopath, good_name)

+                    # compat compression for rhel5 compatibility from fedora :(

+                    compress_type = self.conf.compress_type

+                    if self.compat_compress:

+                        compress_type = 'bz2'

+                        

                     # rename from silly name to not silly name

                     os.rename(tmp_result_path, resultpath)

-                    compressed_name = '%s.bz2' % good_name

+                    compressed_name = '%s.%s' % (good_name, compress_type)

                     result_compressed = os.path.join(repopath, compressed_name)

                     db_csums[ftype] = misc.checksum(sumtype, resultpath)

                     # compress the files

-                    bzipFile(resultpath, result_compressed)

+

+                    compressFile(resultpath, result_compressed, compress_type)

                     # csum the compressed file

                     db_compressed_sums[ftype] = misc.checksum(sumtype,

                                                              result_compressed)

@@ -983,8 +1012,8 @@ class MetaDataGenerator:

                     os.unlink(resultpath)

                     if self.conf.unique_md_filenames:

-                        csum_compressed_name = '%s-%s.bz2' % (

-                                           db_compressed_sums[ftype], good_name)

+                        csum_compressed_name = '%s-%s.%s' % (

+                                           db_compressed_sums[ftype], good_name, compress_type)