2 commits - bodhi/masher.py bodhi.spec

[Luke Macken]

 bodhi.spec      |    7 +++++--
 bodhi/masher.py |   13 ++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

New commits:
commit 269f371b0ac6de265616dcd3b1e96f1a53d5d9dc
Author: Luke Macken <lmacken(a)redhat.com&gt;
Date:   Fri Aug 29 19:24:47 2008 -0400

    Our client requires python-setuptools

diff --git a/bodhi.spec b/bodhi.spec
index b673640..7d77511 100644
--- a/bodhi.spec
+++ b/bodhi.spec
@@ -3,7 +3,7 @@
 
 Name:           bodhi
 Version:        0.5.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A modular framework that facilitates publishing software updates
 Group:          Applications/Internet
 License:        GPLv2+
@@ -30,7 +30,7 @@ A modular piece of the Fedora Infrastructure stack
 %package client
 Summary: Bodhi Client
 Group: Applications/Internet
-Requires: python-simplejson python-fedora koji yum
+Requires: python-simplejson python-fedora koji yum python-setuptools
 
 %description client
 Client tools for interacting with bodhi
@@ -112,6 +112,9 @@ rm -rf bodhi/tests bodhi/tools/test-bodhi.py
 
 
 %changelog
+* Fri Aug 29 2008 Luke Macken <lmacken(a)redhat.com&gt; - 0.5.1-3
+- Require python-setuptools in our client
+
 * Mon Aug 25 2008 Luke Macken <lmacken(a)redhat.com&gt; - 0.5.1-2
 - Include the egg-info in the client subpackage.
 


commit 6f47b1e34b61b2d80e910e2ccfc1b897731698ba
Author: Luke Macken <lmacken(a)redhat.com&gt;
Date:   Fri Aug 29 02:40:55 2008 -0400

    Add a hack for our new key

diff --git a/bodhi/masher.py b/bodhi/masher.py
index 8c85a0c..2a39879 100644
--- a/bodhi/masher.py
+++ b/bodhi/masher.py
@@ -404,10 +404,17 @@ class MashTask(Thread):
         for repo, mashdir in self.mashed_repos.items():
             link = join(mashed_dir, repo)
             newrepo = join(mashdir, repo)
+            arches = os.listdir(newrepo)
+
+            # HACK.
+            log.debug("Moving each arch to arch.newkey")
+            for arch in arches:
+                shutil.move(arch, '%s.newkey')
+            arches = os.listdir(newrepo)
+
             log.debug("Running sanity checks on %s" % newrepo)
 
             # make sure the new repository has our arches
-            arches = os.listdir(newrepo)
             for arch in config.get('arches').split():
                 if arch not in arches:
                     self.error_log("Cannot find arch %s in %s" % (arch,
newrepo))
@@ -421,9 +428,9 @@ class MashTask(Thread):
                     return
 
             # make sure that mash didn't symlink our packages
-            for pkg in os.listdir(join(newrepo, 'i386')):
+            for pkg in os.listdir(join(newrepo, arches[0])):
                 if pkg.endswith('.rpm'):
-                    if islink(join(newrepo, 'i386', pkg)):
+                    if islink(join(newrepo, arches[0], pkg)):
                         self.error_log("Mashed repository full of symlinks!")
                         return
                     break