[Rpm-metadata] 4 commits - createrepo/__init__.py

[seth vidal]

On Thu, 2011-02-24 at 20:31 +0000, Ville Skyttä wrote:
> createrepo/__init__.py |   21 ++++++---------------
>  1 file changed, 6 insertions(+), 15 deletions(-)
> 
> New commits:
> commit be08fe4d0a64ed5075cc6878f962db8d78a3244e
> Author: Ville Skyttä <ville.skytta at iki.fi>
> Date:   Thu Feb 24 21:51:11 2011 +0200
> 
>     Fix writing additional metadata.
>     
>     This broke at least when merging updateinfos.
> 
> diff --git a/createrepo/__init__.py b/createrepo/__init__.py
> index 5b70298..44a9e82 100644
> --- a/createrepo/__init__.py
> +++ b/createrepo/__init__.py
> @@ -1049,7 +1049,7 @@ class MetaDataGenerator:
>              
>  
>          if self.conf.additional_metadata:
> -            for md_type, mdfile in self.conf.additional_metadata.items():
> +            for md_type, md_file in self.conf.additional_metadata.items():
>                  mdcontent = self._createRepoDataObject(md_file, md_type)
>                  repomd.repoData[mdcontent.type] = mdcontent


thank you.

> commit caa02d883b9fc5fe5ab0c48de24e0b0e25ddd36a
> Author: Ville Skyttä <ville.skytta at iki.fi>
> Date:   Thu Feb 24 21:19:27 2011 +0200
> 
>     Drop dead code.
> 
> diff --git a/createrepo/__init__.py b/createrepo/__init__.py
> index 07abc27..fdc459c 100644
> --- a/createrepo/__init__.py
> +++ b/createrepo/__init__.py
> @@ -789,7 +789,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
> @@ -879,7 +878,6 @@ 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:
> @@ -1115,12 +1113,6 @@ class MetaDataGenerator:
>                      raise MDError, _(
>                      'Could not remove old metadata file: %s: %s') % (oldfile, e)
>  
> -        # Move everything else back from olddir (eg. repoview files)
> -        try:
> -            old_contents = os.listdir(output_old_dir)
> -        except (OSError, IOError), e:
> -            old_contents = []
> -            


hmmm - why?

-sv