From: Seth Vidal <skvidal@fedoraproject.org>
Date: Fri, 5 Mar 2010 18:18:32 +0000 (-0500)
Subject: Merge branch 'master' of ssh://createrepo.baseurl.org/srv/projects/createrepo/git... 
X-Git-Tag: upstream/0.9.9~26
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ba1853d5c8e54c8876f3a52801451643a5b5e116;p=tools%2Fcreaterepo.git

Merge branch 'master' of ssh://createrepo.baseurl.org/srv/projects/createrepo/git/createrepo

* 'master' of ssh://createrepo.baseurl.org/srv/projects/createrepo/git/createrepo:
  Trim trailing whitespace.
---

ba1853d5c8e54c8876f3a52801451643a5b5e116
diff --cc createrepo/__init__.py
index cb8ba16,d29c9d8..8704562
--- a/createrepo/__init__.py
+++ b/createrepo/__init__.py
@@@ -100,10 -100,9 +100,10 @@@ class MetaDataConfig(object)
          self.revision = str(int(time.time()))
          self.content_tags = [] # flat list of strings (like web 2.0 tags)
          self.distro_tags = []# [(cpeid(None allowed), human-readable-string)]
 +        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
-         
+ 
  class SimpleMDCallBack(object):
      def errorlog(self, thing):
          print >> sys.stderr, thing
@@@ -803,12 -802,12 +803,12 @@@ class MetaDataGenerator
          reporoot = repodoc.newChild(None, "repomd", None)
          repons = reporoot.newNs('http://linux.duke.edu/metadata/repo', None)
          reporoot.setNs(repons)
-         rpmns = reporoot.newNs("http://linux.duke.edu/metadata/rpm", 'rpm')        
+         rpmns = reporoot.newNs("http://linux.duke.edu/metadata/rpm", 'rpm')
          repopath = os.path.join(self.conf.outputdir, self.conf.tempdir)
          repofilepath = os.path.join(repopath, self.conf.repomdfile)
-         
+ 
          revision = reporoot.newChild(None, 'revision', self.conf.revision)
 -        if self.conf.content_tags or self.conf.distro_tags:
 +        if self.conf.content_tags or self.conf.distro_tags or self.conf.repo_tags:
              tags = reporoot.newChild(None, 'tags', None)
              for item in self.conf.content_tags:
                  c_tags = tags.newChild(None, 'content', item)
diff --cc genpkgmetadata.py
index 81e86c2,4ab4e9a..1c6a8b3
--- a/genpkgmetadata.py
+++ b/genpkgmetadata.py
@@@ -100,10 -100,8 +100,10 @@@ def parse_args(args, conf)
          default=False, action="store_true")
      parser.add_option("--distro", default=[], action="append",
          help="distro tag and optional cpeid: --distro" "'cpeid,textname'")
-     parser.add_option("--content", default=[], dest='content_tags', 
+     parser.add_option("--content", default=[], dest='content_tags',
          action="append", help="tags for the content in the repository")
 +    parser.add_option("--repo", default=[], dest='repo_tags', 
 +        action="append", help="tags to describe the repository itself")
      parser.add_option("--revision", default=None,
          help="user-specified revision for this repository")
      parser.add_option("--deltas", default=False, action="store_true",