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

[chninkel at users.sourceforge.net]

Revision: 19591
          http://gar.svn.sourceforge.net/gar/?rev=19591&view=rev
Author:   chninkel
Date:     2012-11-10 10:38:44 +0000 (Sat, 10 Nov 2012)
Log Message:
-----------
gar: fixed a dumb mistake in IPS package information handling

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

Modified: csw/mgar/gar/v2/lib/python/system_pkgmap.py
===================================================================
--- csw/mgar/gar/v2/lib/python/system_pkgmap.py	2012-11-09 22:49:24 UTC (rev 19590)
+++ csw/mgar/gar/v2/lib/python/system_pkgmap.py	2012-11-10 10:38:44 UTC (rev 19591)
@@ -209,7 +209,7 @@
       pkgnames.extend(parts[6:])
     elif file_type == '?':
       # Does not follow the specfication.  A specimen:
-      # /opt/csw/gcc3/lib/gcc/sparc-sun-solaris2.8/3.4.6/include 
+      # /opt/csw/gcc3/lib/gcc/sparc-sun-solaris2.8/3.4.6/include
       # ? none CSWgcc3g77 CSWgcc3core
       logging.warning("File type of %s is '?', assuming it's a directory.",
                       parts[0])
@@ -301,7 +301,7 @@
   def _GetArch(self):
     return self._GetUname("-p")
 
-  def GetDataStructure(self, srv4_pkgcontent_stream, srv4_pkginfo_stream, 
+  def GetDataStructure(self, srv4_pkgcontent_stream, srv4_pkginfo_stream,
                        ips_pkgcontent_stream, ips_pkginfo_stream,
                        osrel, arch, show_progress=False):
     """Gets the data structure to be pickled.
@@ -316,7 +316,7 @@
     }
     if ips_pkginfo_stream and ips_pkgcontent_stream:
       data["contents"].extend(self._ParsePkgContents(ips_pkgcontent_stream, self._ParseIpsPkgContentsLine, show_progress))
-      data["pkginfo"].update(self._ParsePkgInfos(ips_pkgcontent_stream, self._ParseIpsPkgListLine, show_progress))
+      data["pkginfo"].update(self._ParsePkgInfos(ips_pkginfo_stream, self._ParseIpsPkgListLine, show_progress))
 
     return data
 
@@ -328,12 +328,12 @@
     if self.osrel in common_constants.IPS_OS_RELS:
       ips_pkgcontents_stream = self._GetIpsPkgcontentStream()
       ips_pkginfos_stream = self._GetIpsPkginfosStream()
-    else: 
+    else:
       ips_pkgcontents_stream = None
       ips_pkginfos_stream = None
-      
-    data = self.GetDataStructure(srv4_pkgcontents_stream, srv4_pkginfos_stream, 
-                                 ips_pkgcontents_stream, ips_pkginfos_stream, 
+
+    data = self.GetDataStructure(srv4_pkgcontents_stream, srv4_pkginfos_stream,
+                                 ips_pkgcontents_stream, ips_pkginfos_stream,
                                  self.osrel, self.arch, show_progress)
     return data
 
@@ -367,7 +367,7 @@
       stdout, stderr = pkginfo_proc.communicate()
       ret = pkginfo_proc.wait()
       pkginfo_stream = stdout.splitlines()
-    
+
     return pkginfo_stream
 
   def _GetIpsPkginfosStream(self):

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