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

[wahwah at users.sourceforge.net]

Revision: 20535
          http://gar.svn.sourceforge.net/gar/?rev=20535&view=rev
Author:   wahwah
Date:     2013-03-29 16:50:43 +0000 (Fri, 29 Mar 2013)
Log Message:
-----------
checkpkg: Fixes after refactoring.

I did not run unit test before committing, bad me.

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

Modified: csw/mgar/gar/v2/lib/python/checkpkg_lib.py
===================================================================
--- csw/mgar/gar/v2/lib/python/checkpkg_lib.py	2013-03-29 16:11:55 UTC (rev 20534)
+++ csw/mgar/gar/v2/lib/python/checkpkg_lib.py	2013-03-29 16:50:43 UTC (rev 20535)
@@ -846,7 +846,7 @@
   """
 
   def __init__(self):
-    super(CatalogMixin, self).__init__()
+    super(Catalog, self).__init__()
     self.pkgs_by_path_cache = {}
 
   def GetInstalledPackages(self, osrel, arch, catrel):

Modified: csw/mgar/gar/v2/lib/python/models_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/models_test.py	2013-03-29 16:11:55 UTC (rev 20534)
+++ csw/mgar/gar/v2/lib/python/models_test.py	2013-03-29 16:50:43 UTC (rev 20535)
@@ -51,6 +51,7 @@
         basename="foo.pkg",
         catalogname="foo",
         data_obj=None,
+        data_obj_mimetype='text/plain',
         filename_arch=self.sqo_arch,
         maintainer=self.maintainer,
         md5_sum="not a real one",

Modified: csw/mgar/gar/v2/lib/python/package_stats_test.py
===================================================================
--- csw/mgar/gar/v2/lib/python/package_stats_test.py	2013-03-29 16:11:55 UTC (rev 20534)
+++ csw/mgar/gar/v2/lib/python/package_stats_test.py	2013-03-29 16:50:43 UTC (rev 20535)
@@ -79,7 +79,7 @@
   class TestPackageStats(package_stats.PackageStatsMixin):
     pass
 
-  class TestCatalog(checkpkg_lib.CatalogMixin):
+  class TestCatalog(checkpkg_lib.Catalog):
     pass
 
   def testWithoutInitialDataImport(self):

Modified: csw/mgar/gar/v2/lib/python/system_pkgmap.py
===================================================================
--- csw/mgar/gar/v2/lib/python/system_pkgmap.py	2013-03-29 16:11:55 UTC (rev 20534)
+++ csw/mgar/gar/v2/lib/python/system_pkgmap.py	2013-03-29 16:50:43 UTC (rev 20535)
@@ -483,6 +483,7 @@
             basename=("%s-fake_version" % catalogname),
             catalogname=catalogname,
             data_obj=None,
+            data_obj_mimetype='text/plain',
             use_to_generate_catalogs=False,
             filename_arch=sqo_arch,
             maintainer=maintainer,

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