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

[chninkel at users.sourceforge.net]

Revision: 20885
          http://gar.svn.sourceforge.net/gar/?rev=20885&view=rev
Author:   chninkel
Date:     2013-04-27 22:23:07 +0000 (Sat, 27 Apr 2013)
Log Message:
-----------
gar/checkpkg: reverted previous screwed commit that included unwanted changes

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 21:57:55 UTC (rev 20884)
+++ csw/mgar/gar/v2/lib/python/inspective_package.py	2013-04-27 22:23:07 UTC (rev 20885)
@@ -691,9 +691,8 @@
     self._magic_cookie = None
 
   def close(self):
-    if self._magic_cookie is not None:
-      self._magic_cookie.close()
-      self._magic_cookie = 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 21:57:55 UTC (rev 20884)
+++ csw/mgar/gar/v2/lib/python/models.py	2013-04-27 22:23:07 UTC (rev 20885)
@@ -104,8 +104,8 @@
 
 
 class Pkginst(sqlobject.SQLObject):
-  pkgname = sqlobject.UnicodeCol(length=80, unique=True, notNone=True)
-  catalogname = sqlobject.UnicodeCol(default=None, length=80)
+  pkgname = sqlobject.UnicodeCol(length=50, unique=True, notNone=True)
+  catalogname = sqlobject.UnicodeCol(default=None, length=50)
   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 21:57:55 UTC (rev 20884)
+++ csw/mgar/gar/v2/lib/python/package.py	2013-04-27 22:23:07 UTC (rev 20885)
@@ -47,8 +47,6 @@
 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 21:57:55 UTC (rev 20884)
+++ csw/mgar/gar/v2/lib/python/package_stats.py	2013-04-27 22:23:07 UTC (rev 20885)
@@ -223,8 +223,6 @@
         "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.