mirrorlist-server/mirrorlist_server.py
by Matt Domsch
mirrorlist-server/mirrorlist_server.py | 1 +
1 file changed, 1 insertion(+)
New commits:
commit c052c991434e70d2d11ffc1ba59d7eaf44415acd
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Mon Aug 23 10:56:10 2010 -0500
mirrorlist_server: put back the <?xml ?> header line accidentally removed in the previous commit
diff --git a/mirrorlist-server/mirrorlist_server.py b/mirrorlist-server/mirrorlist_server.py
index e366f33..fd9f8c6 100755
--- a/mirrorlist-server/mirrorlist_server.py
+++ b/mirrorlist-server/mirrorlist_server.py
@@ -97,6 +97,7 @@ def metalink_header():
# fixme add alternate format pubdate when specified
pubdate = datetime.datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S GMT")
doc = ''
+ doc += '<?xml version="1.0" encoding="utf-8"?>\n'
doc += '<metalink version="3.0" xmlns="http://www.metalinker.org/"'
doc += ' type="dynamic"'
doc += ' pubdate="%s"' % pubdate
13 years, 8 months
mirrorlist-server/mirrorlist_server.py
by Matt Domsch
mirrorlist-server/mirrorlist_server.py | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
New commits:
commit aee20493d04f061e6b7733e808807326a455b076
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Mon Aug 23 10:48:02 2010 -0500
mirrorlist_server: always output a metalink header
reported in https://bugzilla.redhat.com/show_bug.cgi?id=625922
the metalink failuredoc did not include the metalink header as would
be required to be considered valid XML.
diff --git a/mirrorlist-server/mirrorlist_server.py b/mirrorlist-server/mirrorlist_server.py
index 9c85343..e366f33 100755
--- a/mirrorlist-server/mirrorlist_server.py
+++ b/mirrorlist-server/mirrorlist_server.py
@@ -91,15 +91,27 @@ def uniqueify(seq, idfun=None):
result.append(item)
return result
-
##### Metalink Support #####
-def metalink_failuredoc(message=None):
+
+def metalink_header():
+ # fixme add alternate format pubdate when specified
+ pubdate = datetime.datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S GMT")
doc = ''
- doc += '<?xml version="1.0" encoding="utf-8"?>\n'
+ doc += '<metalink version="3.0" xmlns="http://www.metalinker.org/"'
+ doc += ' type="dynamic"'
+ doc += ' pubdate="%s"' % pubdate
+ doc += ' generator="mirrormanager"'
+ doc += ' xmlns:mm0="http://fedorahosted.org/mirrormanager"'
+ doc += '>\n'
+ return doc
+
+def metalink_failuredoc(message=None):
+ doc = metalink_header()
if message is not None:
doc += '<!--\n'
doc += message + '\n'
doc += '-->\n'
+ doc += '</metalink>\n'
return doc
def metalink_file_not_found(directory, file):
@@ -108,8 +120,6 @@ def metalink_file_not_found(directory, file):
def metalink(cache, directory, file, hosts_and_urls):
preference = 100
- # fixme add alternate format pubdate when specified
- pubdate = datetime.datetime.utcnow().strftime("%a, %d %b %Y %H:%M:%S GMT")
try:
fdc = file_details_cache[directory]
detailslist = fdc[file]
@@ -119,14 +129,7 @@ def metalink(cache, directory, file, hosts_and_urls):
def indent(n):
return ' ' * n * 2
- doc = ''
- doc += '<?xml version="1.0" encoding="utf-8"?>\n'
- doc += '<metalink version="3.0" xmlns="http://www.metalinker.org/"'
- doc += ' type="dynamic"'
- doc += ' pubdate="%s"' % pubdate
- doc += ' generator="mirrormanager"'
- doc += ' xmlns:mm0="http://fedorahosted.org/mirrormanager"'
- doc += '>\n'
+ doc = metalink_header()
doc += indent(1) + '<files>\n'
doc += indent(2) + '<file name="%s">\n' % (file)
y = detailslist[0]
13 years, 8 months
Changes to 'refs/tags/v1.3.6'
by Matt Domsch
Tag 'v1.3.6' created by Matt Domsch <matt(a)domsch.com> at 2010-08-01 07:09 +0000
v1.3.6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
iQEVAwUATFUdnVq36sXWI9AEAQh2bAgAq0Mm7biWLQ3F3gl94dj4oCv134vv5fow
R4OSa9d7WtPfgTCQ067w104ky9XI8gTvvrIyncU6qw5GgZbpZVhQyAa6ZW7Yl+N4
7hcnkpUPEJU4/z4zX/6WUYwl8C2ome6Ydygd2YQ+iqNEykYi1Cjwp4n3hEOZVu4z
9hMCxu+D0lOmUDPVBT1+csFCLCcBKmlq1CDGLqFDIRzAoeG9stF2UnETlvtLhsbz
vhzLIJSt2yY4evKUDsKCt4qZ0GLTkKzhTRwyekfBS3Tc8irQxIcM4xFeky+iUyyb
GCyrERqwk6bQJDKjioBtsu7x2ib4WIFgNzcX3A8va1RxF1O0Afg6bA==
=+Co6
-----END PGP SIGNATURE-----
Changes since 1.3.6:
Matt Domsch (1):
v1.3.6
---
Makefile | 6 +++---
mirrormanager.spec.in | 10 ++++++++++
2 files changed, 13 insertions(+), 3 deletions(-)
---
13 years, 8 months
Makefile mirrormanager.spec.in
by Matt Domsch
Makefile | 6 +++---
mirrormanager.spec.in | 10 ++++++++++
2 files changed, 13 insertions(+), 3 deletions(-)
New commits:
commit 31d8c6fbdbd3db6f2f8f4be3ecaa3a0735748557
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Sun Aug 1 02:08:56 2010 -0500
v1.3.6
diff --git a/Makefile b/Makefile
index d791154..e44d96c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-RELEASE_DATE := "26-May-2010"
+RELEASE_DATE := "31-Jul-2010"
RELEASE_MAJOR := 1
RELEASE_MINOR := 3
-RELEASE_EXTRALEVEL := .5
+RELEASE_EXTRALEVEL := .6
RELEASE_NAME := mirrormanager
RELEASE_VERSION := $(RELEASE_MAJOR).$(RELEASE_MINOR)$(RELEASE_EXTRALEVEL)
RELEASE_STRING := $(RELEASE_NAME)-$(RELEASE_VERSION)
@@ -122,6 +122,6 @@ publish: sign
scp dist/* fedorahosted.org:/srv/web/releases/m/i/mirrormanager/
git-sign-push:
- git tag -s -m v$(RELEASE_VERSION) $(RELEASE_VERSION)
+ git tag -s -m v$(RELEASE_VERSION) v$(RELEASE_VERSION)
git push
git push --tags
diff --git a/mirrormanager.spec.in b/mirrormanager.spec.in
index 1c8e00f..f99e492 100644
--- a/mirrormanager.spec.in
+++ b/mirrormanager.spec.in
@@ -85,6 +85,16 @@ exit 0
%changelog
+* Sat Jul 31 2010 Matt Domsch <mdomsch(a)fedoraproject.org> - 1.3.6-1
+Matt Domsch (8):
+ mirrorlist_server: add mm0:private attribute to <url> in metalinks
+ add repomaps for RHEL
+ category named "RHEL", not "Red Hat Enterprise Linux". Fix references.
+ repomap: remove extra -beta on prefixes
+ umdl: set Repository.name = directory.name to be guaranteed unique
+ remove robots.txt and favicon.ico. These should come from the hosting organization, not MM.
+ crawler: don't close sys.stdout as logfile, leave that for sys.exit()
+
* Wed May 26 2010 Matt Domsch <mdomsch(a)fedoraproject.org> - 1.3.5-1
- Adrian Reber (1):
mirrorlist_server: handle bad client IP address input
13 years, 8 months
Changes to 'refs/tags/1.3.6'
by Matt Domsch
Tag '1.3.6' created by Matt Domsch <matt(a)domsch.com> at 2010-08-01 01:13 +0000
v1.3.6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
iQEVAwUATFTKOFq36sXWI9AEAQiqrwf/V3aTiZ6FWTzRdozwiDkk4YvYRA52Q4n8
5ACvf2TEBiu0BwVYzk0hJLBAYNAg82ym7/bui/TGT93p5+WHGhJqsUf2lHpTZErX
/Ny81nfPsHEV28vvLfDJ2x7Qjw+NRWurQ7FBx+M0ECjKJ7hLtCWxsyzsqln1SJmI
IOOc64ZOq/eWGSzz5jcTq/rZ4esYXYhBZSXoZInZtfxSVreLmvOD6ljhbNSbF061
dsTdjrAVwFXZxihaqkCUqqC8Hv9/d5rC9wyXQ08L89201Mk51c1LsxEL5/oWsjRf
KBpHvUvqB+szdlFoOx9YnBtq8TRtFA+Oo+ukEsvJqXgaVz3w39tLzQ==
=XeZ7
-----END PGP SIGNATURE-----
Changes since 1.3.5:
Matt Domsch (8):
mirrorlist_server: add mm0:private attribute to <url> in metalinks
TODO: add 'create Category' item
add repomaps for RHEL
category named "RHEL", not "Red Hat Enterprise Linux". Fix references.
repomap: remove extra -beta" on prefixes
umdl: set Repository.name = directory.name to be guaranteed unique
remove robots.txt and favicon.ico. These should come from the hosting organization, not MM.
crawler: don't close sys.stdout as logfile, leave that for sys.exit()
---
TODO | 2 +
mirrorlist-server/mirrorlist_server.py | 9 ++++---
server/crawler_perhost | 4 +--
server/mirrormanager/repomap.py | 41 +++++++++++++++++++++++++++++++++
server/update-master-directory-list | 33 +++++++++++++++++++++-----
server/update-static-content | 2 -
6 files changed, 78 insertions(+), 13 deletions(-)
---
13 years, 8 months