[Extras-cauldron-commits] r122 - trunk/buildme/tools

[ed_ at garage.maemo.org]

Author: ed_
Date: 2008-11-23 21:30:47 +0200 (Sun, 23 Nov 2008)
New Revision: 122

Modified:
   trunk/buildme/tools/buildme
Log:
debugging results

Modified: trunk/buildme/tools/buildme
===================================================================
--- trunk/buildme/tools/buildme	2008-11-23 19:30:36 UTC (rev 121)
+++ trunk/buildme/tools/buildme	2008-11-23 19:30:47 UTC (rev 122)
@@ -19,13 +19,13 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA
 #
-# $Id$
+# $Id: buildme 120 2008-11-23 17:12:09Z ed_ $
 
 """
 buildme. Builds source packages for Maemo Extras-devel repo
 """
 
-__revision__ = "r"+"$Revision$".split(' ')[1]
+__revision__ = "r"+"$Revision: 120 $".split(' ')[1]
 
 import sys, os, logging, pwd, shutil
 
@@ -41,7 +41,7 @@
 from minideblib.ChangeFile import ChangeFileException
 from minideblib.AptRepoClient import AptRepoClient
 from minideblib.DpkgVersion import DpkgVersion
-from minideblib DpkgDebPackage import DpkgDebPackage
+from minideblib.DpkgDebPackage import DpkgDebPackage
 
 from buildlib.fsm import FSM
 from buildlib.exceptions import Error
@@ -365,7 +365,6 @@
     # version check
     product = env.params['product']
     logger = env.params['logger']
-    allowed_categories = env.params['allowed_categories']
     dsc = env.params['dsc']
     source = dsc['source']
     version = dsc['version']
@@ -382,12 +381,6 @@
         logger.removeHandler(env.params['uploader_handler'])
         return FSM.NEXT
 
-    # category check
-    if 'section' in dsc:
-        category = dsc['section'].lower()
-        if category.startswith('user/') and category.split('user/')[1] not in allowed_categories:
-            logger.summary("WARNING: package '%d' has non-standard category: '%s'" % (dsc, dsc['section']))
-
     return FSM.OK
 
 def iter_targets(env):
@@ -511,7 +504,8 @@
     allowed_categories = env.params['allowed_categories']
 
     # category check
-    for fname in glob.glob(os.path.join(resultdir, '*.deb')):
+    for fname in glob(os.path.join(resultdir, '*.deb')):
+        logger.debug("Check category for '%s'" % fname)
         pkg = DpkgDebPackage(fname)
         # category check
         if 'section' in pkg.control: