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

[chninkel at users.sourceforge.net]

Revision: 20983
          http://gar.svn.sourceforge.net/gar/?rev=20983&view=rev
Author:   chninkel
Date:     2013-05-04 10:06:14 +0000 (Sat, 04 May 2013)
Log Message:
-----------
fix a mistake in the ShellCommand merging previous commit

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

Modified: csw/mgar/gar/v2/lib/python/package.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package.py	2013-05-04 09:56:50 UTC (rev 20982)
+++ csw/mgar/gar/v2/lib/python/package.py	2013-05-04 10:06:14 UTC (rev 20983)
@@ -126,7 +126,7 @@
       gunzipped_path = self.GetGunzippedPath()
       args = ["nawk", "NR == 2 {print $1; exit;}", gunzipped_path]
       shell.ShellCommand(args)
-      self.pkgname = stdout.strip()
+      retcode, stdout, stderr = self.pkgname = stdout.strip()
       logging.debug("GetPkgname(): %s", repr(self.pkgname))
     return self.pkgname
 
@@ -409,7 +409,7 @@
     full_paths = self.GetAllFilePaths()
     files_by_pattern = {}
     for full_path in full_paths:
-      abs_path = self.MakeAbsolutePath(full_path)   
+      abs_path = self.MakeAbsolutePath(full_path)
       if not os.path.getsize(abs_path):
         continue
       with open(abs_path, "rb") as f:

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