bodhi/masher.py | 2 +- bodhi/metadata.py | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-)
New commits: commit 399097f14118341ac0068770d4d1c927ffe6d570 Author: Luke Macken lmacken@redhat.com Date: Mon Sep 20 15:57:57 2010 -0400
Fix a bug in the new code to insert security/critpath updates in the testing digest
diff --git a/bodhi/masher.py b/bodhi/masher.py index 2fbde75..744d7a9 100644 --- a/bodhi/masher.py +++ b/bodhi/masher.py @@ -778,7 +778,7 @@ class MashTask(Thread): return updates
def get_security_updates(self, release): - release = Release.select(Release.q.long_name==release) + release = Release.select(Release.q.long_name==release)[0] return PackageUpdate.select( AND(PackageUpdate.q.releaseID == release.id, PackageUpdate.q.type == 'security',
commit 93464014852529f0f4d43eec6ec8934ca86bc880 Author: Luke Macken lmacken@redhat.com Date: Mon Sep 20 15:57:02 2010 -0400
Fix a bug in our new pkgtags metadata insertion code
diff --git a/bodhi/metadata.py b/bodhi/metadata.py index af415bd..11dbda0 100644 --- a/bodhi/metadata.py +++ b/bodhi/metadata.py @@ -287,20 +287,21 @@ class ExtendedMetadata(object): if arch == 'SRPMS': continue filename = '' - if self.repo.startswith('f'): - release = self.repo[1:].split('-')[0] + reponame = os.path.basename(self.repo) + if reponame.startswith('f'): + release = reponame[1:].split('-')[0] filename = 'F-%s-%s-' % (release, arch) - if 'testing' in self.repo: + if 'testing' in reponame: filename += 'tu' else: filename += 'u' - elif self.repo.startswith('el'): - release = self.repo[2:].split('-')[0] + elif reponame.startswith('el'): + release = reponame[2:].split('-')[0] filename = 'E-%s-%s' % (release, arch) - if 'testing' in self.repo: + if 'testing' in reponame: filename += '-t' else: - log.error('Unknown repo %s' % self.repo) + log.error('Unknown repo %s' % reponame) return
tags_url = config.get('pkgtags_url') + filename