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

[ed_ at garage.maemo.org]

Author: ed_
Date: 2010-01-25 21:53:48 +0200 (Mon, 25 Jan 2010)
New Revision: 171

Modified:
   trunk/buildme/tools/buildme
Log:
reject if not possible to get list of build targets

Modified: trunk/buildme/tools/buildme
===================================================================
--- trunk/buildme/tools/buildme	2010-01-25 19:52:30 UTC (rev 170)
+++ trunk/buildme/tools/buildme	2010-01-25 19:53:48 UTC (rev 171)
@@ -396,14 +396,21 @@
     logger = env.params['logger']
     env.params['targets'] = {}
     for change in changes:
-        env.params['targets'][change] = env.params['sbdtargets'].gettargets(change)
         source = change['source']
         version = change['version']
+        try:
+            env.params['targets'][change] = env.params['sbdtargets'].gettargets(change)
+        except Error, exobj:
+            # reject .changes if can't get targets from it
+            # most probably it means that wrong architecture is specified in .dsc
+            reject_fname(env, "%s %s - %s" % (source, version, str(exobj)))
+            logger.removeHandler(env.params['uploader_handler'])
+            return FSM.NEXT
 
         repo = env.params["conf"].get(product, 'src_repo')
         client = AptRepoClient(env.params["conf"].get(product, 'src_repo'))
         client.update()
-         
+ 
         repo_version = client.get_best_source_version(source)[-1]
         try: 
             if repo_version and DpkgVersion(repo_version) >= DpkgVersion(version):