bodhi/config/f8-updates-testing.mash | 7 ++++---
bodhi/config/f8-updates.mash | 7 ++++---
bodhi/config/f9-updates-testing.mash | 7 ++++---
bodhi/config/f9-updates.mash | 7 ++++---
bodhi/masher.py | 8 --------
5 files changed, 16 insertions(+), 20 deletions(-)
New commits:
commit 35a823a77bf7906f7ab814ac5af8130ae3edc615
Author: Jesse Keating <jkeating(a)redhat.com>
Date: Thu Dec 18 19:07:38 2008 -0800
Use config options to get .newkey stuff, rather than post-commpose moves.
diff --git a/bodhi/config/f8-updates-testing.mash b/bodhi/config/f8-updates-testing.mash
index b23aee9..a514e74 100644
--- a/bodhi/config/f8-updates-testing.mash
+++ b/bodhi/config/f8-updates-testing.mash
@@ -1,8 +1,9 @@
# mash config file
[f8-updates-testing]
-rpm_path = %(arch)s/
-source_path = SRPMS/
+rpm_path = %(arch)s.newkey/
+source_path = SRPMS.newkey/
+debuginfo_path = %(arch)s.newkey/debug
debuginfo = True
multilib = True
multilib_method = devel
@@ -10,6 +11,6 @@ tag = dist-f8-updates-testing
inherit = False
strict_keys = True
keys = DF9B0AE9
-repoviewurl =
http://download.fedoraproject.org/pub/fedora/linux/updates/testing/8/%(ar...
+repoviewurl =
http://download.fedoraproject.org/pub/fedora/linux/updates/testing/8/%(ar...
repoviewtitle = "Fedora 8 Updates Testing - %(arch)s"
arches = i386 x86_64 ppc ppc64
diff --git a/bodhi/config/f8-updates.mash b/bodhi/config/f8-updates.mash
index 86bf7f6..510af3c 100644
--- a/bodhi/config/f8-updates.mash
+++ b/bodhi/config/f8-updates.mash
@@ -1,8 +1,9 @@
# mash config file
[f8-updates]
-rpm_path = %(arch)s/
-source_path = SRPMS/
+rpm_path = %(arch)s.newkey/
+source_path = SRPMS.newkey/
+debuginfo_path = %(arch)s.newkey/debug
debuginfo = True
multilib = True
multilib_method = devel
@@ -10,6 +11,6 @@ tag = dist-f8-updates
inherit = False
strict_keys = True
keys = 6DF2196F
-repoviewurl =
http://download.fedoraproject.org/pub/fedora/linux/updates/8/%(arch)s/
+repoviewurl =
http://download.fedoraproject.org/pub/fedora/linux/updates/8/%(arch)s.new...
repoviewtitle = "Fedora 8 Updates - %(arch)s"
arches = i386 x86_64 ppc ppc64
diff --git a/bodhi/config/f9-updates-testing.mash b/bodhi/config/f9-updates-testing.mash
index 35223af..f36a732 100644
--- a/bodhi/config/f9-updates-testing.mash
+++ b/bodhi/config/f9-updates-testing.mash
@@ -1,8 +1,9 @@
# mash config file
[f9-updates-testing]
-rpm_path = %(arch)s/
-source_path = SRPMS/
+rpm_path = %(arch)s.newkey/
+source_path = SRPMS.newkey/
+debuginfo_path = %(arch)s.newkey/debug
debuginfo = True
multilib = True
multilib_method = devel
@@ -10,6 +11,6 @@ tag = dist-f9-updates-testing
inherit = False
strict_keys = True
keys = DF9B0AE9
-repoviewurl =
http://download.fedoraproject.org/pub/fedora/linux/updates/testing/9/%(ar...
+repoviewurl =
http://download.fedoraproject.org/pub/fedora/linux/updates/testing/9/%(ar...
repoviewtitle = "Fedora 9 Updates Testing - %(arch)s"
arches = i386 x86_64 ppc ppc64
diff --git a/bodhi/config/f9-updates.mash b/bodhi/config/f9-updates.mash
index 314934d..02aec19 100644
--- a/bodhi/config/f9-updates.mash
+++ b/bodhi/config/f9-updates.mash
@@ -1,8 +1,9 @@
# mash config file
[f9-updates]
-rpm_path = %(arch)s/
-source_path = SRPMS/
+rpm_path = %(arch)s.newkey/
+source_path = SRPMS.newkey/
+debuginfo_path = %(arch)s.newkey/debug
debuginfo = True
multilib = True
multilib_method = devel
@@ -10,6 +11,6 @@ tag = dist-f9-updates
inherit = False
strict_keys = True
keys = 6DF2196F
-repoviewurl =
http://download.fedoraproject.org/pub/fedora/linux/updates/9/%(arch)s/
+repoviewurl =
http://download.fedoraproject.org/pub/fedora/linux/updates/9/%(arch)s.new...
repoviewtitle = "Fedora 9 Updates - %(arch)s"
arches = i386 x86_64 ppc ppc64
diff --git a/bodhi/masher.py b/bodhi/masher.py
index c0c599c..fb87260 100644
--- a/bodhi/masher.py
+++ b/bodhi/masher.py
@@ -445,14 +445,6 @@ class MashTask(Thread):
newrepo = join(mashdir, repo)
arches = os.listdir(newrepo)
- # HACK.
- if 'f9' in repo or 'f8' in repo:
- log.debug("Moving each arch to arch.newkey")
- for arch in arches:
- if not arch.endswith('.newkey'):
- shutil.move(join(newrepo, arch), join(newrepo,
'%s.newkey' % arch))
- arches = os.listdir(newrepo)
-
log.debug("Running sanity checks on %s" % newrepo)
# make sure the new repository has our arches