server/update-master-directory-list | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-)
New commits: commit bd0fe39e545683463af5897cafd1c83d9abca55a Author: Matt Domsch Matt_Domsch@dell.com Date: Wed May 26 20:26:22 2010 -0500
umdl: don't use move_repository_from_development()
For Fedora 13, when releases/13 was created, this routine moved the Repository pointers from development/13 to releases/13 as expected. However, releases/13 was not world readable yet, so all users of mirrorlist?repo=fedora-13 broke.
I'm not sure we can do this in umdl. We would have to know the permissions, and hope they don't get more restrictive after creation. Ugh. So, nuke it from umdl for now, and consider doing this in the releaseday script (to be added at some point).
diff --git a/server/update-master-directory-list b/server/update-master-directory-list index 9de759a..4bdc226 100755 --- a/server/update-master-directory-list +++ b/server/update-master-directory-list @@ -195,18 +195,6 @@ def make_repomd_file_details(dir): fd = FileDetail(directory=dir, filename='repomd.xml', sha1=sha1, md5=md5, sha256=sha256, sha512=sha512, timestamp=timestamp, size=size)
- -def move_repository_from_development(prefix, arch, newdir): - try: - repo = Repository.selectBy(prefix=prefix, arch=arch)[0] - except: - return None - - if repo.directory is not None and newdir.name is not None: - if '/development' in repo.directory.name and '/releases' in newdir.name: - repo.directory = newdir - return repo - def make_repository(dir, category): repo = None path = dir.name[len(category.topdir.name)+1:] @@ -223,17 +211,10 @@ def make_repository(dir, category): try: repo = Repository(name=name, category=category, version=ver, arch=arch, directory=dir, prefix=prefix) except: - # repo exists, but it may be one we want to move - try: - repo = move_repository_from_development(prefix, arch, dir) - except: - pass + pass
return repo
- - - def nuke_gone_directories(category, category_directories): """ deleting a Directory has a ripple effect through the whole database. Be really sure you're ready do to this. It comes