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

[wahwah at users.sourceforge.net]

Revision: 15261
          http://gar.svn.sourceforge.net/gar/?rev=15261&view=rev
Author:   wahwah
Date:     2011-08-05 08:24:45 +0000 (Fri, 05 Aug 2011)

Log Message:
-----------
checkpkg: Report if catalog release not in db

https://www.opencsw.org/mantis/view.php?id=4795

Improve the error message by providing additional logging: What was the
catalog release requested, and what are the available catalog releases.

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

Modified: csw/mgar/gar/v2/lib/python/checkpkg2.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg2.py	2011-08-05 07:36:50 UTC (rev 15260)
+++ csw/mgar/gar/v2/lib/python/checkpkg2.py	2011-08-05 08:24:45 UTC (rev 15261)
@@ -123,8 +123,17 @@
   sqo_pkgs = list(models.Srv4FileStats.select(
     sqlobject.IN(models.Srv4FileStats.q.md5_sum, md5_sums)))
   tags_for_all_osrels = []
+  try:
+    sqo_catrel = models.CatalogRelease.selectBy(name=options.catrel).getOne()
+  except sqlobject.main.SQLObjectNotFound, e:
+    logging.fatal("Fetching from the db has failed: catrel=%s",
+                  repr(str(options.catrel)))
+    logging.fatal("Available catalog releases:")
+    sqo_catrels = models.CatalogRelease.select()
+    for sqo_catrel in sqo_catrels:
+      logging.fatal(" - %s", sqo_catrel.name)
+    raise
   sqo_arch = models.Architecture.selectBy(name=options.arch).getOne()
-  sqo_catrel = models.CatalogRelease.selectBy(name=options.catrel).getOne()
   for osrel in osrel_list:
     sqo_osrel = models.OsRelease.selectBy(short_name=osrel).getOne()
     dm.VerifyContents(sqo_osrel, sqo_arch)


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