mirrormanager-commits November 2011

mirrormanager-commits@lists.fedorahosted.org

3 participants
17 discussions

Branch 'v1.3' - server/update-master-directory-list
by Matt Domsch 14 Nov '11

14 Nov '11

server/update-master-directory-list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1777c6592035e7f62ff70450ca75757fd42f6736 Author: Matt Domsch <Matt_Domsch(a)dell.com> Date: Mon Nov 14 16:56:36 2011 -0600 umdl: follow symlinks diff --git a/server/update-master-directory-list b/server/update-master-directory-list index 95ba977..5e08405 100755 --- a/server/update-master-directory-list +++ b/server/update-master-directory-list @@ -417,7 +417,7 @@ def sync_directories_from_directory(directory, cname, excludes=[]): # and the matching directory is pub/fedora/linux. # paths below this then have directories of $path/dirname[len(topdir)+1:] stdexcludes=['.*\.snapshot', '.*/\.~tmp~'] - for dirpath, dirnames, filenames in os.walk(directory, topdown=True): + for dirpath, dirnames, filenames in os.walk(directory, topdown=True, followlinks=True): next=False for e in stdexcludes + excludes: if re.compile(e).match(dirpath):

1 0

Branch 'v1.3' - mirrormanager.spec.in
by Matt Domsch 14 Nov '11

14 Nov '11

mirrormanager.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit fb956e714378fe03b6c990e96d16c4bfd2a0806b Author: Matt Domsch <Matt_Domsch(a)dell.com> Date: Mon Nov 14 16:21:42 2011 -0600 fix spec changelog order diff --git a/mirrormanager.spec.in b/mirrormanager.spec.in index 0667093..16fe8c5 100644 --- a/mirrormanager.spec.in +++ b/mirrormanager.spec.in @@ -156,6 +156,9 @@ Matt Domsch (8): mirrorlist-server: use WSGIDaemonProcess for mirrorlist_client.wsgi mirrormanager.wsgi run 4 instances per app server (up from 2) +* Mon Oct 26 2009 Matt Domsch <mdomsch(a)fedoraproject.org> - 1.3.3-2 +- add patch to fix confirm delete from webui + * Thu Sep 28 2009 Matt Domsch <mdomsch(a)fedoraproject.org> - 1.3.3-1 - initial setup patches from BJ Dierkes - simpler mirrormanager.initial, README.rpm_setup, prod.cfg @@ -164,9 +167,6 @@ Matt Domsch (8): * Thu Sep 28 2009 Matt Domsch <mdomsch(a)fedoraproject.org> - 1.3.2-1 - add BGP ASN lookups -* Mon Oct 26 2009 Matt Domsch <mdomsch(a)fedoraproject.org> - 1.3.3-2 -- add patch to fix confirm delete from webui - * Fri Sep 18 2009 Matt Domsch <mdomsch(a)fedoraproject.org> - 1.3.1-1 - fix publiclist html - fix Host netblock creation via web UI

1 0

Branch 'v1.3' - 2 commits - server/dev-fas.cfg server/mirrormanager server/setup.py
by Matt Domsch 14 Nov '11

14 Nov '11

server/dev-fas.cfg | 1 - server/mirrormanager/config/app.cfg | 6 +++--- server/setup.py | 3 +++ 3 files changed, 6 insertions(+), 4 deletions(-) New commits: commit 3c04f26f8a3f5a8a74cd7951577593ca2b69043d Author: Matt Domsch <Matt_Domsch(a)dell.com> Date: Mon Nov 14 16:19:59 2011 -0600 fix setup.py for RHEL6 packages too diff --git a/server/setup.py b/server/setup.py index 50e3caa..af759fb 100644 --- a/server/setup.py +++ b/server/setup.py @@ -1,3 +1,6 @@ +__requires__ = ['TurboGears'] +import pkg_resources + from setuptools import setup, find_packages from turbogears.finddata import find_package_data commit 266220cd9c74cae1bb58bbb6f511bc39a21f9ca6 Author: Toshio Kuratomi <toshio(a)fedoraproject.org> Date: Wed Jul 20 19:59:57 2011 -0700 Two fixes for TG-1.1.x: Set the default template engine to kid explicitly and remove unneeded sqlalchemy.dburi:/// for using jsonfas auth. diff --git a/server/dev-fas.cfg b/server/dev-fas.cfg index 71b4f6d..3c0414b 100644 --- a/server/dev-fas.cfg +++ b/server/dev-fas.cfg @@ -45,7 +45,6 @@ tg.strict_parameters = True ############################## # Fedora Account System config -sqlalchemy.dburi="sqlite:///" identity.provider='jsonfas2' identity.saprovider.model.visit="fedora.accounts.tgfas.VisitIdentity" visit.manager="jsonfas2" diff --git a/server/mirrormanager/config/app.cfg b/server/mirrormanager/config/app.cfg index a09f610..e6f68bc 100644 --- a/server/mirrormanager/config/app.cfg +++ b/server/mirrormanager/config/app.cfg @@ -10,14 +10,14 @@ # which view (template engine) to use if one is not specified in the # template name -# tg.defaultview = "kid" +tg.defaultview = "kid" # The following kid settings determine the settings used by the kid serializer. # One of (html|xml|json) -# kid.outputformat="html" +kid.outputformat="html" -# kid.encoding="utf-8" +kid.encoding="utf-8" # The sitetemplate is used for overall styling of a site that # includes multiple TurboGears applications

1 0

server/dev-fas.cfg server/mirrormanager
by Toshio くらとみ 14 Nov '11

14 Nov '11

server/dev-fas.cfg | 1 - server/mirrormanager/config/app.cfg | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) New commits: commit b65e1e2b28b6534e2b90e2d35e7f7da4f75c6dbb Author: Toshio Kuratomi <toshio(a)fedoraproject.org> Date: Wed Jul 20 19:59:57 2011 -0700 Two fixes for TG-1.1.x: Set the default template engine to kid explicitly and remove unneeded sqlalchemy.dburi:/// for using jsonfas auth. diff --git a/server/dev-fas.cfg b/server/dev-fas.cfg index 71b4f6d..3c0414b 100644 --- a/server/dev-fas.cfg +++ b/server/dev-fas.cfg @@ -45,7 +45,6 @@ tg.strict_parameters = True ############################## # Fedora Account System config -sqlalchemy.dburi="sqlite:///" identity.provider='jsonfas2' identity.saprovider.model.visit="fedora.accounts.tgfas.VisitIdentity" visit.manager="jsonfas2" diff --git a/server/mirrormanager/config/app.cfg b/server/mirrormanager/config/app.cfg index a09f610..e6f68bc 100644 --- a/server/mirrormanager/config/app.cfg +++ b/server/mirrormanager/config/app.cfg @@ -10,14 +10,14 @@ # which view (template engine) to use if one is not specified in the # template name -# tg.defaultview = "kid" +tg.defaultview = "kid" # The following kid settings determine the settings used by the kid serializer. # One of (html|xml|json) -# kid.outputformat="html" +kid.outputformat="html" -# kid.encoding="utf-8" +kid.encoding="utf-8" # The sitetemplate is used for overall styling of a site that # includes multiple TurboGears applications

1 0

Branch 'v1.3' - mirrormanager.spec.in
by Matt Domsch 14 Nov '11

14 Nov '11

mirrormanager.spec.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit d8cde745551b634da67faa323509c4fbad9c4d8b Author: Matt Domsch <Matt_Domsch(a)dell.com> Date: Mon Nov 14 14:14:41 2011 -0600 add requires python-fedora-turbogears (BZ753608) diff --git a/mirrormanager.spec.in b/mirrormanager.spec.in index ccdc58d..0667093 100644 --- a/mirrormanager.spec.in +++ b/mirrormanager.spec.in @@ -1,6 +1,6 @@ Name: mirrormanager Version: ##VERSION## -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fedora mirror management system BuildArch: noarch @@ -10,7 +10,8 @@ URL: http://fedorahosted.org/mirrormanager Source0: https://fedorahosted.org/releases/m/i/%{name}/%{name}-%{version}.tar.bz2 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: python -Requires: TurboGears, python-IPy, python-GeoIP, wget, yum, psmisc, python-dns, python-fedora >= 0.3.14, py-radix, mod_wsgi +Requires: TurboGears, python-IPy, python-GeoIP, wget, yum, psmisc, python-dns, py-radix, mod_wsgi +Requires: python-fedora > 0.3.14, python-fedora-turbogears Requires: python-basemap >= 0.99.4, python-basemap-data >= 0.99.4 Requires(pre): shadow-utils @@ -85,6 +86,9 @@ exit 0 %changelog +* Mon Nov 14 2011 Matt Domsch <mdomsch(a)fedoraproject.org> - 1.3.7-2 +- add requires python-fedora-turbogears (BZ753608) + * Sat Sep 11 2010 Matt Domsch <mdomsch(a)fedoraproject.org> - 1.3.7-1 Matt Domsch: mirrorlist_server: always output a metalink header

1 0

Branch 'v1.3' - server/move-to-archive
by Matt Domsch 09 Nov '11

09 Nov '11

server/move-to-archive | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) New commits: commit c78ac71837e4b0a2d5789195e073adf1fd520b19 Author: Matt Domsch <Matt_Domsch(a)dell.com> Date: Wed Nov 9 10:56:40 2011 -0600 add move-to-archive, copied from FI production diff --git a/server/move-to-archive b/server/move-to-archive index 5152378..fc5d634 100755 --- a/server/move-to-archive +++ b/server/move-to-archive @@ -7,7 +7,7 @@ from sqlobject import * import turbogears from mirrormanager.model import * from optparse import OptionParser -import re +import sys, re from turbogears.database import PackageHub hub = __connection__ = None @@ -20,16 +20,17 @@ originalCategory = 'Fedora Linux' def doit(): global options - c = Category.selectBy(name=options.originalCategory)[0] - a = Category.selectBy(name=options.archiveCategory)[0] + c = Category.byName(originalCategory) + a = Category.byName(archiveCategory) originalTopdir = c.topdir.name - archiveTopdir = a.topdir.name + archiveTopdir = a.topdir.name + '/fedora/linux' dirRe = re.compile(options.directoryRe) for d in c.directories: if dirRe.search(d.name): r = d.repository if r is not None: t = archiveTopdir + d.name[len(originalTopdir):] + print "trying to find %s" % t try: new_d = Directory.byName(t) r.directory = new_d @@ -38,6 +39,7 @@ def doit(): print "%s => %s" % (d.name, t) except: print "Unable to find a directory in [%s] for %s" % (options.archiveCategory, d.name) + raise def main(): global options

1 0

Branch 'v1.3' - server/move-devel-to-release
by Matt Domsch 09 Nov '11

09 Nov '11

server/move-devel-to-release | 69 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) New commits: commit 8775d06a595d91d2baceb0b02f58b5e3a5aa77da Author: Matt Domsch <Matt_Domsch(a)dell.com> Date: Wed Nov 9 10:52:54 2011 -0600 add move-devel-to-release script diff --git a/server/move-devel-to-release b/server/move-devel-to-release new file mode 100644 index 0000000..1725406 --- /dev/null +++ b/server/move-devel-to-release @@ -0,0 +1,69 @@ +#!/usr/bin/python +__requires__ = 'TurboGears[future]' +import pkg_resources +pkg_resources.require("TurboGears") + +from sqlobject import * +import turbogears +from mirrormanager.model import * +from optparse import OptionParser +import sys, re, os + +from turbogears.database import PackageHub +hub = __connection__ = None + +options = None + +# moving repository pointers from pub/fedora/linux/development/14/x86_64/os to pub/fedora/linux/releases/14/Everything/x86_64/os +# This assumes you are moving the pointers within the same category, not across categories. + + +def doit(): + global options + c = Category.byName(options.category) + topdir = c.topdir.name + oldpattern = os.path.join('development', options.version) + newpattern = os.path.join('releases', options.version, 'Everything') + oldRe = re.compile(oldpattern) + for d in c.directories: + if oldRe.search(d.name): + r = d.repository + if r is not None: + t = d.name.replace(oldpattern, newpattern) + try: + new_d = Directory.byName(t) + r.directory = new_d + r.sync() + print "%s => %s" % (d.name, t) + except: + raise + +def main(): + global options + parser = OptionParser(usage=sys.argv[0] + " [options]") + parser.add_option("-c", "--config", + dest="config", default='/etc/mirrormanager/prod.cfg', + help="TurboGears config file to use (default=/etc/mirrormanager/prod.cfg)") + parser.add_option("-v", "--version", + dest="version", action="store", type="string", help="OS version to move (e.g. '14') [required]", default=None) + parser.add_option("--category", + dest="category", action="store", type="string", help="MM Category (e.g. 'Fedora Linux')", default=u'Fedora Linux') + + (options, args) = parser.parse_args() + if options.version is None: + parser.print_help() + sys.exit(1) + + turbogears.update_config(configfile=options.config, + modulename="mirrormanager.config") + global hub + global __connection__ + hub = PackageHub("mirrormanager") + __connection__ = hub + + doit() + return 0 + +if __name__ == "__main__": + sys.exit(main()) +

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

mirrormanager-commits November 2011