[csw-devel] SF.net SVN: gar:[13477] csw/mgar/gar/v2/lib/web/pkgdb_web.py

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Sun Feb 27 01:36:27 CET 2011


Revision: 13477
          http://gar.svn.sourceforge.net/gar/?rev=13477&view=rev
Author:   wahwah
Date:     2011-02-27 00:36:27 +0000 (Sun, 27 Feb 2011)

Log Message:
-----------
pkgdb: More specific catalog parsing regexes

They allow dashes in catalog names.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/web/pkgdb_web.py

Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py
===================================================================
--- csw/mgar/gar/v2/lib/web/pkgdb_web.py	2011-02-27 00:35:54 UTC (rev 13476)
+++ csw/mgar/gar/v2/lib/web/pkgdb_web.py	2011-02-27 00:36:27 UTC (rev 13477)
@@ -18,7 +18,7 @@
   r'/srv4/([0-9a-f]{32})/', 'Srv4Detail',
   r'/srv4/([0-9a-f]{32})/files/', 'Srv4DetailFiles',
   r'/catalogs/', 'CatalogList',
-  r'/catalogs/([^-]+)-([^-]+)-([^-]+)/', 'CatalogDetail',
+  r'/catalogs/([\w-]+)-(sparc|i386)-(SunOS[^-]+)/', 'CatalogDetail',
   r'/maintainers/', 'MaintainerList',
   r'/maintainers/(\d+)/', 'MaintainerDetail',
   r'/maintainers/(\d+)/checkpkg/', 'MaintainerCheckpkgReport',
@@ -27,11 +27,11 @@
   r'/catalognames/', 'CatalognameList',
   r'/catalognames/([^/]+)/', 'Catalogname',
   r'/error-tags/', 'ErrorTagList',
-  r'/rest/catalogs/([^/]+)/([^/]+)/([^/]+)/', 'Catalogs',
-  r'/rest/catalogs/([^/]+)/([^/]+)/([^/]+)/pkgname-by-filename',
+  r'/rest/catalogs/([\w-]+)-(sparc|i386)-(SunOS[^-]+)/', 'Catalogs',
+  r'/rest/catalogs/([\w-]+)-(sparc|i386)-(SunOS[^-]+)/pkgname-by-filename',
       'PkgnameByFilename',
   # Query by catalog release, arch, OS release and catalogname
-  r'/rest/catalogs/([^/]+)/([^/]+)/([^/]+)/catalognames/([^/]+)/', 'Srv4ByCatAndCatalogname',
+  r'/rest/catalogs/([\w-]+)-(sparc|i386)-(SunOS[^-]+)/catalognames/([^/]+)/', 'Srv4ByCatAndCatalogname',
   r'/rest/srv4/([0-9a-f]{32})/', 'RestSrv4Detail',
 )
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list