Revision: 23681
http://sourceforge.net/p/gar/code/23681
Author: wahwah
Date: 2014-05-22 09:55:31 +0000 (Thu, 22 May 2014)
Log Message:
-----------
releases-web: Allow uploading to any catalog
Modified Paths:
--------------
csw/mgar/gar/v2/lib/web/releases_web.py
Modified: csw/mgar/gar/v2/lib/web/releases_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/releases_web.py 2014-05-22 09:55:23 UTC (rev
23680)
+++ csw/mgar/gar/v2/lib/web/releases_web.py 2014-05-22 09:55:31 UTC (rev
23681)
@@ -54,15 +54,7 @@
config = configuration.GetConfig()
ALLPKGS_DIR = os.path.join(config.get("buildfarm", "opencsw_root"), "allpkgs")
-CAN_UPLOAD_TO_CATALOGS = frozenset([
- "bratislava",
- "dublin",
- "kiel",
- "unstable",
- "legacy",
-])
-
applogger = logging.getLogger('opencsw')
applogger.setLevel(logging.DEBUG)
log_handler = logging.FileHandler(filename=config.get("releases_app",
"log_file"))
@@ -270,14 +262,6 @@
# used for logging
catspec = checkpkg_lib.CatalogSpec(catrel_name, arch_name, osrel_name)
logging.info('PUT %s %s', catspec, md5_sum)
- if catrel_name not in CAN_UPLOAD_TO_CATALOGS:
- # Updates via web are allowed only for the unstable catalog.
- # We should return an error message instead.
- # Sadly, we cannot return a response body due to webpy's API
- # limitation.
- raise web.forbidden(
- 'You can only upload to the following catalogs:'
- + ' '.join(CAN_UPLOAD_TO_CATALOGS))
try:
if arch_name == 'all':
raise web.badrequest("There is no 'all' catalog, cannot proceed.")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
