[Extras-cauldron-commits] r168 - in branches/buildme/1.5.1: debian tools

[ed_ at garage.maemo.org]

Author: ed_
Date: 2010-01-24 18:28:36 +0200 (Sun, 24 Jan 2010)
New Revision: 168

Modified:
   branches/buildme/1.5.1/debian/changelog
   branches/buildme/1.5.1/tools/buildme
Log:
reject .dsc files with unknown architecture 

Modified: branches/buildme/1.5.1/debian/changelog
===================================================================
--- branches/buildme/1.5.1/debian/changelog	2010-01-24 16:23:53 UTC (rev 167)
+++ branches/buildme/1.5.1/debian/changelog	2010-01-24 16:28:36 UTC (rev 168)
@@ -1,8 +1,9 @@
 buildme (1.5.1) unstable; urgency=low
 
   * taken configs and buildme.d/ scripts from production 
+  * reject .dsc files with unknown architecture 
 
- -- Ed Bartosh <bartosh at gmail.com>  Sun, 24 Jan 2010 10:23:24 +0200
+ -- Ed Bartosh <bartosh at gmail.com>  Sun, 24 Jan 2010 18:28:41 +0200
 
 buildme (1.5.0) unstable; urgency=low
 

Modified: branches/buildme/1.5.1/tools/buildme
===================================================================
--- branches/buildme/1.5.1/tools/buildme	2010-01-24 16:23:53 UTC (rev 167)
+++ branches/buildme/1.5.1/tools/buildme	2010-01-24 16:28:36 UTC (rev 168)
@@ -19,13 +19,13 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA
 #
-# $Id: buildme 128 2009-04-01 21:20:13Z ed_ $
+# $Id$
 
 """
 buildme. Builds source packages for Maemo Extras-devel repo
 """
 
-__revision__ = "r"+"$Revision: 128 $".split(' ')[1]
+__revision__ = "r"+"$Revision$".split(' ')[1]
 
 import sys, os, logging, pwd, shutil, subprocess
 
@@ -348,7 +348,15 @@
 
     env.params['dsc'] = dsc
     env.params['extraopts'] = ""
-    env.params['targets'] = env.params['sbdtargets'].gettargets(dsc)
+    try:
+        env.params['targets'] = env.params['sbdtargets'].gettargets(dsc)
+    except Error, exobj:
+        # reject .dsc if can't get targets from it
+        # most probably it means that wrong architecture is specified in .dsc
+        logger.removeHandler(handler)
+        reject_fname(env, exobj)
+        return FSM.NEXT
+        
     env.params['firstbuild'] = True
     env.params['uploader_handler'] = handler