2 commits - createrepo/__init__.py

 createrepo/__init__.py |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit caded22502edaf8e85cc16f3350b6f5be6a94bcd
Merge: 404a70c... 42b3415...
Author: Seth Vidal <[email protected]>
Date:   Fri Jun 11 10:50:18 2010 -0400

    Merge branch 'master' of ssh://createrepo.baseurl.org/srv/projects/createrepo/git/createrepo
    
    * 'master' of ssh://createrepo.baseurl.org/srv/projects/createrepo/git/createrepo:
      Don't use /usr/bin/env ... it's evil
      --database is now the default for mergerepo too, have --no-database in completions instead.

commit 404a70c0e70c42c83b8566e1b3558b9ede83330f
Author: Seth Vidal <[email protected]>
Date:   Fri Jun 11 10:44:40 2010 -0400

    - add option to createrepo config to collapse libc.so.6 requires
    - this will only work with yum 3.2.28 and beyond

diff --git a/createrepo/__init__.py b/createrepo/__init__.py
index 41e8db8..120e1b0 100644
--- a/createrepo/__init__.py
+++ b/createrepo/__init__.py
@@ -103,6 +103,7 @@ class MetaDataConfig(object):
         self.repo_tags = []# strings, forwhatever they are worth
         self.read_pkgs_list = None # filepath/name to write out list of pkgs
                                    # read in this run of createrepo
+        self.collapse_glibc_requires = True
 
 class SimpleMDCallBack(object):
     def errorlog(self, thing):
@@ -472,6 +473,7 @@ class MetaDataGenerator:
         po._baseurl = baseurl
         po._reldir = reldir
         po._packagenumber = self.current_pkg
+        po._collapse_libc_requires = self.conf.collapse_glibc_requires
         for r in po.requires_print:
             if r.startswith('rpmlib('):
                 self.rpmlib_reqs[r] = 1