From 7c4cb64859472b852d098c90f8929b2a464ec4be Mon Sep 17 00:00:00 2001 From: nemobis Date: Sat, 23 Nov 2013 12:19:46 +0000 Subject: [PATCH] Revert r874: breaks backwards compatibility, no usecase provided git-svn-id: https://wikiteam.googlecode.com/svn/trunk@883 31edc4fc-5e31-b4c4-d58b-c8bc928bcb95 --- uploader.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/uploader.py b/uploader.py index 61c1922..cd79bd5 100644 --- a/uploader.py +++ b/uploader.py @@ -76,9 +76,6 @@ def upload(wikis): print "#"*73 wiki = wiki.lower() prefix = dumpgenerator.domain2prefix(config={'api': wiki}) - domain = re.sub(r'(/index\.php|/api\.php)', '', wiki) - domain = re.sub(r'(http://|https://)', '', domain) - domain = re.sub(r'/', '_', domain) wikiname = prefix.split('-')[0] dumps = [] @@ -211,7 +208,7 @@ def upload(wikis): ] curl += ['--upload-file', "%s" % (dump), - "http://s3.us.archive.org/wiki-%s/%s" % (domain, dump), # It could happen that the identifier is taken by another user; only wikiteam collection admins will be able to upload more files to it, curl will fail immediately and get a permissions error by s3. + "http://s3.us.archive.org/wiki-%s/%s" % (wikiname, dump), # It could happen that the identifier is taken by another user; only wikiteam collection admins will be able to upload more files to it, curl will fail immediately and get a permissions error by s3. ] curlline = ' '.join(curl) os.system(curlline)