[csw-devel] SF.net SVN: gar:[20016] csw/mgar/gar/v2-yann

chninkel at users.sourceforge.net chninkel at users.sourceforge.net
Thu Jan 3 20:28:34 CET 2013


Revision: 20016
          http://gar.svn.sourceforge.net/gar/?rev=20016&view=rev
Author:   chninkel
Date:     2013-01-03 19:28:34 +0000 (Thu, 03 Jan 2013)
Log Message:
-----------
gar/v2-yann: merge last changes from the main branch

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

Property Changed:
----------------
    csw/mgar/gar/v2-yann/


Property changes on: csw/mgar/gar/v2-yann
___________________________________________________________________
Modified: svn:mergeinfo
   - /csw/mgar/gar/v2:4936-6678,19234-19981
/csw/mgar/gar/v2-bwalton:9784-10011
/csw/mgar/gar/v2-checkpkg:7722-7855
/csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737
/csw/mgar/gar/v2-checkpkg-stats:8454-8649
/csw/mgar/gar/v2-collapsed-modulations:6895
/csw/mgar/gar/v2-defaultchange:13903-14022
/csw/mgar/gar/v2-dirpackage:8125-8180
/csw/mgar/gar/v2-fortran:10883-12516
/csw/mgar/gar/v2-git/v2-relocate:7617
/csw/mgar/gar/v2-migrateconf:7082-7211
/csw/mgar/gar/v2-noexternals:11592-11745
/csw/mgar/gar/v2-raised-buildlevel:15906-15949
/csw/mgar/gar/v2-relocate:5028-11738
/csw/mgar/gar/v2-skayser:6087-6132
/csw/mgar/gar/v2-solaris11:18134-18236
/csw/mgar/gar/v2-sqlite:10434-10449
/csw/mgar/gar/v2-uwatch2:12141-13270
   + /csw/mgar/gar/v2:4936-6678,19234-20010
/csw/mgar/gar/v2-bwalton:9784-10011
/csw/mgar/gar/v2-checkpkg:7722-7855
/csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737
/csw/mgar/gar/v2-checkpkg-stats:8454-8649
/csw/mgar/gar/v2-collapsed-modulations:6895
/csw/mgar/gar/v2-defaultchange:13903-14022
/csw/mgar/gar/v2-dirpackage:8125-8180
/csw/mgar/gar/v2-fortran:10883-12516
/csw/mgar/gar/v2-git/v2-relocate:7617
/csw/mgar/gar/v2-migrateconf:7082-7211
/csw/mgar/gar/v2-noexternals:11592-11745
/csw/mgar/gar/v2-raised-buildlevel:15906-15949
/csw/mgar/gar/v2-relocate:5028-11738
/csw/mgar/gar/v2-skayser:6087-6132
/csw/mgar/gar/v2-solaris11:18134-18236
/csw/mgar/gar/v2-sqlite:10434-10449
/csw/mgar/gar/v2-uwatch2:12141-13270

Modified: csw/mgar/gar/v2-yann/lib/python/csw_upload_pkg.py
===================================================================
--- csw/mgar/gar/v2-yann/lib/python/csw_upload_pkg.py	2013-01-03 15:46:37 UTC (rev 20015)
+++ csw/mgar/gar/v2-yann/lib/python/csw_upload_pkg.py	2013-01-03 19:28:34 UTC (rev 20016)
@@ -22,8 +22,8 @@
 import file_set_checker
 import sys
 import getpass
+import urllib2
 
-
 BASE_URL = "http://buildfarm.opencsw.org"
 RELEASES_APP = "/releases"
 DEFAULT_CATREL = "unstable"
@@ -309,8 +309,11 @@
       for osrel in osrels:
         logging.debug("%s %s %s", catrel, arch, osrel)
         cat_key = (catrel, arch, osrel)
-        srv4_in_catalog = self._rest_client.Srv4ByCatalogAndCatalogname(
-            catrel, arch, osrel, catalogname)
+        try:
+          srv4_in_catalog = self._rest_client.Srv4ByCatalogAndCatalogname(
+              catrel, arch, osrel, catalogname)
+        except urllib2.HTTPError, e:
+          srv4_in_catalog = None
         if srv4_in_catalog:
           logging.debug("Catalog %s %s contains version %s of the %s package",
                         arch, osrel, srv4_in_catalog["osrel"], catalogname)

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