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

[wahwah at users.sourceforge.net]

Revision: 11372
          http://gar.svn.sourceforge.net/gar/?rev=11372&view=rev
Author:   wahwah
Date:     2010-10-22 07:59:57 +0000 (Fri, 22 Oct 2010)

Log Message:
-----------
mGAR v2: patchpkg, a docstring for the package name composer.

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

Modified: csw/mgar/gar/v2/lib/python/opencsw.py
===================================================================
--- csw/mgar/gar/v2/lib/python/opencsw.py	2010-10-22 07:59:37 UTC (rev 11371)
+++ csw/mgar/gar/v2/lib/python/opencsw.py	2010-10-22 07:59:57 UTC (rev 11372)
@@ -117,8 +117,12 @@
 
 
 def ComposePackageFileName(parsed_filename):
-  file_name = 'mysql5client-5.0.87,REV=2010.02.28-SunOS5.8-i386-CSW.pkg.gz'
-  tmpl = "%(catalogname)s-%(new_version)s-%(osrel)s-%(arch)s-%(vendortag)s.pkg.gz"
+  """Composes package name, based on a parsed filename data structure.
+
+  Does not use the version_string property, but builds the version from
+  the basic version plus revision info.
+  """
+  tmpl = "%(catalogname)s-%(new_version)s-%(osrel)s-%(arch)s-%(vendortag)s.pkg"
   version_string = parsed_filename["version"]
   revision_info = parsed_filename["revision_info"]
   for key in sorted(revision_info.keys()):

Modified: csw/mgar/gar/v2/lib/python/opencsw_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/opencsw_test.py	2010-10-22 07:59:37 UTC (rev 11371)
+++ csw/mgar/gar/v2/lib/python/opencsw_test.py	2010-10-22 07:59:57 UTC (rev 11372)
@@ -1,4 +1,4 @@
-#!/opt/csw/bin/python2.6
+#!/usr/bin/env python2.6
 # $Id$
 
 import copy


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