[Extras-cauldron-commits] r128 - in trunk/buildme: debian tools

[ed_ at garage.maemo.org]

Author: ed_
Date: 2009-04-02 00:20:13 +0300 (Thu, 02 Apr 2009)
New Revision: 128

Modified:
   trunk/buildme/debian/changelog
   trunk/buildme/tools/buildme
Log:
* bugfix: catched DpkgVersion exceptions
* bugfix: checked if fname is in environment

Modified: trunk/buildme/debian/changelog
===================================================================
--- trunk/buildme/debian/changelog	2009-04-01 16:03:37 UTC (rev 127)
+++ trunk/buildme/debian/changelog	2009-04-01 21:20:13 UTC (rev 128)
@@ -1,3 +1,10 @@
+buildme (1.4.8) unstable; urgency=low
+
+  * bugfix: catched DpkgVersion exceptions
+  * bugfix: checked if fname is in environment
+
+ -- Ed Bartosh <bartosh at gmail.com>  Wed, 01 Apr 2009 21:18:45 +0000
+
 buildme (1.4.7) unstable; urgency=low
 
   * implemented categories check 

Modified: trunk/buildme/tools/buildme
===================================================================
--- trunk/buildme/tools/buildme	2009-04-01 16:03:37 UTC (rev 127)
+++ trunk/buildme/tools/buildme	2009-04-01 21:20:13 UTC (rev 128)
@@ -19,13 +19,13 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA
 #
-# $Id: buildme 120 2008-11-23 17:12:09Z ed_ $
+# $Id$
 
 """
 buildme. Builds source packages for Maemo Extras-devel repo
 """
 
-__revision__ = "r"+"$Revision: 120 $".split(' ')[1]
+__revision__ = "r"+"$Revision$".split(' ')[1]
 
 import sys, os, logging, pwd, shutil
 
@@ -40,7 +40,7 @@
 
 from minideblib.ChangeFile import ChangeFileException
 from minideblib.AptRepoClient import AptRepoClient
-from minideblib.DpkgVersion import DpkgVersion
+from minideblib.DpkgVersion import DpkgVersion, BadInputError
 from minideblib.DpkgDebPackage import DpkgDebPackage
 
 from buildlib.fsm import FSM
@@ -143,12 +143,15 @@
             else:
                 build_status = "OK"
 
-        splitted = os.path.splitext(os.path.basename(env.params["fname"]))[0].split("_")
-        if len(splitted) == 2:
-            package, version = splitted
+        if "fname" in env.params:
+            splitted = os.path.splitext(os.path.basename(env.params["fname"]))[0].split("_")
+            if len(splitted) == 2:
+                package, version = splitted
+            else:
+                package = splitted[0]
+                version = ""
         else:
-            package = splitted[0]
-            version = ""
+            package = version = "unknown"
 
         return env.params["conf"].get(env.params["product"], "subject_template", False,
                         {"package" : package, "version" : version, "build_status" : build_status})
@@ -374,10 +377,14 @@
     client.update()
     
     repo_version = client.get_best_source_version(source)[-1]
-    
-    if repo_version and DpkgVersion(repo_version) >= DpkgVersion(version):
-        reject_fname(env, "The same or newer version (%s %s) is already in extras-devel" \
-                    % (source, repo_version))
+    try: 
+        if repo_version and DpkgVersion(repo_version) >= DpkgVersion(version):
+            reject_fname(env, "The same or newer version (%s %s) is already in extras-devel" \
+                        % (source, repo_version))
+            logger.removeHandler(env.params['uploader_handler'])
+            return FSM.NEXT
+    except BadInputError, exobj:
+        reject_fname(env, "%s %s - %s" % (source, version, str(exobj)))
         logger.removeHandler(env.params['uploader_handler'])
         return FSM.NEXT