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

chninkel at users.sourceforge.net chninkel at users.sourceforge.net
Sat Apr 27 23:57:56 CEST 2013


Revision: 20884
          http://gar.svn.sourceforge.net/gar/?rev=20884&view=rev
Author:   chninkel
Date:     2013-04-27 21:57:55 +0000 (Sat, 27 Apr 2013)
Log Message:
-----------
gar/checkpkg: (FileMagic) don't call close on _magic_cookie if it has not been initialized

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

Modified: csw/mgar/gar/v2/lib/python/inspective_package.py
===================================================================
--- csw/mgar/gar/v2/lib/python/inspective_package.py	2013-04-27 19:20:32 UTC (rev 20883)
+++ csw/mgar/gar/v2/lib/python/inspective_package.py	2013-04-27 21:57:55 UTC (rev 20884)
@@ -691,8 +691,9 @@
     self._magic_cookie = None
 
   def close(self):
-    self._magic_cookie.close()
-    self._magic_cookie = None
+    if self._magic_cookie is not None:
+      self._magic_cookie.close()
+      self._magic_cookie = None
 
   @property
   def magic_cookie(self):

Modified: csw/mgar/gar/v2/lib/python/models.py
===================================================================
--- csw/mgar/gar/v2/lib/python/models.py	2013-04-27 19:20:32 UTC (rev 20883)
+++ csw/mgar/gar/v2/lib/python/models.py	2013-04-27 21:57:55 UTC (rev 20884)
@@ -104,8 +104,8 @@
 
 
 class Pkginst(sqlobject.SQLObject):
-  pkgname = sqlobject.UnicodeCol(length=50, unique=True, notNone=True)
-  catalogname = sqlobject.UnicodeCol(default=None, length=50)
+  pkgname = sqlobject.UnicodeCol(length=80, unique=True, notNone=True)
+  catalogname = sqlobject.UnicodeCol(default=None, length=80)
   pkg_desc = sqlobject.UnicodeCol(default=None, length=250)
   srv4_files = sqlobject.MultipleJoin('Srv4FileStats')
 

Modified: csw/mgar/gar/v2/lib/python/package.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package.py	2013-04-27 19:20:32 UTC (rev 20883)
+++ csw/mgar/gar/v2/lib/python/package.py	2013-04-27 21:57:55 UTC (rev 20884)
@@ -47,6 +47,8 @@
 class PackageError(Error):
   """A problem with the package itself that causes problems with examining it."""
 
+class StdoutSyntaxError(Error):
+  pass
 
 class StdoutSyntaxError(Error):
   """Problem with data returned by a process."""

Modified: csw/mgar/gar/v2/lib/python/package_stats.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_stats.py	2013-04-27 19:20:32 UTC (rev 20883)
+++ csw/mgar/gar/v2/lib/python/package_stats.py	2013-04-27 21:57:55 UTC (rev 20884)
@@ -223,6 +223,8 @@
         "mtime": self.GetMtime().isoformat(),
         "ldd_info": dir_pkg.GetLddMinusRlines(),
         "binaries_elf_info": dir_pkg.GetBinaryElfInfo(),
+	"ldd_info": dir_pkg.GetLddMinusRlines(),
+	"binaries_elf_info": dir_pkg.GetBinaryElfInfo(),
     }
     self.SaveStats(pkg_stats)
     logging.debug("_CollectStats(): Stats of %s have been collected and saved in the db.",

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



More information about the devel mailing list