|
 |
bf0bbc5 |
diff --git a/configs/rawhide.mash b/configs/rawhide.mash
|
|
|
bf0bbc5 |
index ba68d8f..6a68ef8 100644
|
|
|
bf0bbc5 |
--- a/configs/rawhide.mash
|
|
|
bf0bbc5 |
+++ b/configs/rawhide.mash
|
|
|
bf0bbc5 |
@@ -15,5 +15,3 @@ repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/%(a
|
|
|
bf0bbc5 |
repoviewtitle = "Fedora Rawhide - %(arch)s"
|
|
|
bf0bbc5 |
arches = i386 x86_64 ppc ppc64
|
|
|
bf0bbc5 |
delta = True
|
|
|
bf0bbc5 |
-# Change distro_tags as fedora-release version gets bumped
|
|
|
bf0bbc5 |
-distro_tags = "cpe:/o:fedoraproject:fedora:11.92" "rawhide"
|
|
|
bf0bbc5 |
diff --git a/mash/__init__.py b/mash/__init__.py
|
|
|
bf0bbc5 |
index 2cf0d0a..ffba1b7 100644
|
|
|
bf0bbc5 |
--- a/mash/__init__.py
|
|
|
bf0bbc5 |
+++ b/mash/__init__.py
|
|
|
bf0bbc5 |
@@ -113,15 +113,6 @@ class Mash:
|
|
|
bf0bbc5 |
md.set_delta(paths)
|
|
|
bf0bbc5 |
if previous:
|
|
|
bf0bbc5 |
md.set_previous(previous)
|
|
|
bf0bbc5 |
- # Setup the distro tags
|
|
|
bf0bbc5 |
- md.set_distro_tags(self.config.distro_tags)
|
|
|
bf0bbc5 |
- # Setup the content tags based on what we're making
|
|
|
bf0bbc5 |
- if arch == 'SRPMS':
|
|
|
bf0bbc5 |
- md.set_content_tags(['source'])
|
|
|
bf0bbc5 |
- elif path.endswith(self.config.debuginfo_path):
|
|
|
bf0bbc5 |
- md.set_content_tags(['debuginfo-%s' % arch])
|
|
|
bf0bbc5 |
- else:
|
|
|
bf0bbc5 |
- md.set_content_tags(['binary-%s' % arch])
|
|
|
bf0bbc5 |
md.run(path)
|
|
|
bf0bbc5 |
self.logger.info("createrepo: finished %s" % (path,))
|
|
|
bf0bbc5 |
if repoview and self.config.use_repoview:
|
|
|
bf0bbc5 |
diff --git a/mash/config.py b/mash/config.py
|
|
|
bf0bbc5 |
index 9a1842c..0d4abad 100644
|
|
|
bf0bbc5 |
--- a/mash/config.py
|
|
|
bf0bbc5 |
+++ b/mash/config.py
|
|
|
bf0bbc5 |
@@ -45,8 +45,6 @@ class MashConfig(config.BaseConfig):
|
|
|
bf0bbc5 |
delta = config.BoolOption(False)
|
|
|
bf0bbc5 |
delta_dirs = config.ListOption()
|
|
|
bf0bbc5 |
make_ancient = config.BoolOption(False)
|
|
|
bf0bbc5 |
- distro_tags = config.ListOption()
|
|
|
bf0bbc5 |
- content_tags = config.ListOption()
|
|
|
bf0bbc5 |
distros = []
|
|
|
bf0bbc5 |
|
|
|
bf0bbc5 |
class MashDistroConfig(config.BaseConfig):
|
|
|
bf0bbc5 |
@@ -77,8 +75,6 @@ class MashDistroConfig(config.BaseConfig):
|
|
|
bf0bbc5 |
delta = config.Inherit(MashConfig.delta)
|
|
|
bf0bbc5 |
delta_dirs = config.Inherit(MashConfig.delta_dirs)
|
|
|
bf0bbc5 |
make_ancient = config.Inherit(MashConfig.make_ancient)
|
|
|
bf0bbc5 |
- distro_tags = config.Inherit(MashConfig.distro_tags)
|
|
|
bf0bbc5 |
- content_tags = config.Inherit(MashConfig.content_tags)
|
|
|
bf0bbc5 |
previous = None
|
|
|
bf0bbc5 |
|
|
|
bf0bbc5 |
def readMainConfig(conf):
|
|
|
bf0bbc5 |
diff --git a/mash/metadata.py b/mash/metadata.py
|
|
|
bf0bbc5 |
index 4df23f2..1b37cab 100644
|
|
|
bf0bbc5 |
--- a/mash/metadata.py
|
|
|
bf0bbc5 |
+++ b/mash/metadata.py
|
|
|
bf0bbc5 |
@@ -73,14 +73,6 @@ class MetadataOld:
|
|
|
bf0bbc5 |
def set_previous(self, previous):
|
|
|
bf0bbc5 |
self.previous = previous
|
|
|
bf0bbc5 |
|
|
|
bf0bbc5 |
- def set_distro_tags(self, distro_tags):
|
|
|
bf0bbc5 |
- # Sorry, can't do that here.
|
|
|
bf0bbc5 |
- pass
|
|
|
bf0bbc5 |
-
|
|
|
bf0bbc5 |
- def set_content_tags(self, content_tags):
|
|
|
bf0bbc5 |
- # Sorry, can't do that here.
|
|
|
bf0bbc5 |
- pass
|
|
|
bf0bbc5 |
-
|
|
|
bf0bbc5 |
def run(self, path):
|
|
|
bf0bbc5 |
self.args.append(path)
|
|
|
bf0bbc5 |
if self.previous:
|
|
|
bf0bbc5 |
@@ -139,12 +131,6 @@ class MetadataNew:
|
|
|
bf0bbc5 |
self.conf.update_md_path = previous
|
|
|
bf0bbc5 |
self.previous = previous
|
|
|
bf0bbc5 |
|
|
|
bf0bbc5 |
- def set_distro_tags(self, distro_tags):
|
|
|
bf0bbc5 |
- self.conf.distro_tags = distro_tags
|
|
|
bf0bbc5 |
-
|
|
|
bf0bbc5 |
- def set_content_tags(self, content_tags):
|
|
|
bf0bbc5 |
- self.conf.content_tags = content_tags
|
|
|
bf0bbc5 |
-
|
|
|
bf0bbc5 |
def _copy_in_deltas(self, path):
|
|
|
bf0bbc5 |
ts = rpmUtils.transaction.initReadOnlyTransaction()
|
|
|
bf0bbc5 |
ts.pushVSFlags((rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
|