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

[wahwah at users.sourceforge.net]

Revision: 14126
          http://gar.svn.sourceforge.net/gar/?rev=14126&view=rev
Author:   wahwah
Date:     2011-04-11 09:16:01 +0000 (Mon, 11 Apr 2011)

Log Message:
-----------
csw-upload-pkg: Communicate the catalog release

When uploading packages, display the name of the catalog release, e.g.
'unstable'.

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

Modified: csw/mgar/gar/v2/lib/python/csw_upload_pkg.py
===================================================================
--- csw/mgar/gar/v2/lib/python/csw_upload_pkg.py	2011-04-11 09:15:28 UTC (rev 14125)
+++ csw/mgar/gar/v2/lib/python/csw_upload_pkg.py	2011-04-11 09:16:01 UTC (rev 14126)
@@ -171,11 +171,11 @@
       self._RemoveFromCatalog(filename, cat_arch, cat_osrel, file_metadata)
 
   def _RemoveFromCatalog(self, filename, arch, osrel, file_metadata):
-    logging.info("Removing %s (%s %s) from catalog %s %s",
+    logging.info("Removing %s (%s %s) from catalog %s %s %s",
                  file_metadata["catalogname"],
                  file_metadata["arch"],
                  file_metadata["osrel"],
-                 arch, osrel)
+                 DEFAULT_CATREL, arch, osrel)
     md5_sum = self._GetFileMd5sum(filename)
     basename = os.path.basename(filename)
     parsed_basename = opencsw.ParsePackageFileName(basename)
@@ -302,11 +302,11 @@
     logging.debug(
         "_InsertIntoCatalog(%s, %s, %s)",
         repr(arch), repr(osrel), repr(filename))
-    logging.info("Inserting %s (%s %s) into catalog %s %s",
+    logging.info("Inserting %s (%s %s) into catalog %s %s %s",
                  file_metadata["catalogname"],
                  file_metadata["arch"],
                  file_metadata["osrel"],
-                 arch, osrel)
+                 DEFAULT_CATREL, arch, osrel)
     md5_sum = self._GetFileMd5sum(filename)
     basename = os.path.basename(filename)
     parsed_basename = opencsw.ParsePackageFileName(basename)


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