[csw-devel] SF.net SVN: gar:[15199] csw/mgar/gar/v2/lib/python/catalog.py

[bdwalton at users.sourceforge.net]

Revision: 15199
          http://gar.svn.sourceforge.net/gar/?rev=15199&view=rev
Author:   bdwalton
Date:     2011-07-23 03:53:52 +0000 (Sat, 23 Jul 2011)

Log Message:
-----------
.buildsys/v2/lib/python: make the catalog parser resilient against gpg signed catalog files

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/python/catalog.py

Modified: csw/mgar/gar/v2/lib/python/catalog.py
===================================================================
--- csw/mgar/gar/v2/lib/python/catalog.py	2011-07-23 01:18:33 UTC (rev 15198)
+++ csw/mgar/gar/v2/lib/python/catalog.py	2011-07-23 03:53:52 UTC (rev 15199)
@@ -134,7 +134,11 @@
   def _GetCatalogData(self, fd):
     catalog_data = []
     for line in fd:
+      if not line.strip(): continue
       if line.startswith("#"): continue
+      if line.startswith("-----BEGIN PGP SIGNED"): continue
+      if line.startswith("Hash: "): continue
+      if line.startswith("-----BEGIN PGP SIGNATURE"): break
       try:
         parsed = self._ParseCatalogLine(line)
         catalog_data.append(parsed)


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