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

[wahwah at users.sourceforge.net]

Revision: 9261
          http://gar.svn.sourceforge.net/gar/?rev=9261&view=rev
Author:   wahwah
Date:     2010-03-19 14:19:38 +0000 (Fri, 19 Mar 2010)

Log Message:
-----------
mGAR v2: A bugfix for pkgchk command line invocation.

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

Modified: csw/mgar/gar/v2/lib/python/opencsw.py
===================================================================
--- csw/mgar/gar/v2/lib/python/opencsw.py	2010-03-19 13:55:50 UTC (rev 9260)
+++ csw/mgar/gar/v2/lib/python/opencsw.py	2010-03-19 14:19:38 UTC (rev 9261)
@@ -422,9 +422,9 @@
     return os.path.join(self.GetWorkDir(), "admin")
 
   def GetGunzippedPath(self):
-    gzip_suffix = ".gz"
-    pkg_suffix = ".pkg"
     if not self.gunzipped_path:
+      gzip_suffix = ".gz"
+      pkg_suffix = ".pkg"
       if self.pkg_path.endswith("%s%s" % (pkg_suffix, gzip_suffix)):
         base_name_gz = os.path.split(self.pkg_path)[1]
         shutil.copy(self.pkg_path, self.GetWorkDir())
@@ -517,7 +517,7 @@
 
   def GetPkgchkOutput(self):
     """Returns: (exit code, stdout, stderr)."""
-    args = ["pkgchk", "-d", self.GetPkgname()]
+    args = ["pkgchk", "-d", self.GetGunzippedPath(), "all"]
     pkgchk_proc = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     stdout, stderr = pkgchk_proc.communicate()
     ret = pkgchk_proc.wait()


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