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

[ed_ at garage.maemo.org]

Author: ed_
Date: 2008-10-18 19:09:35 +0300 (Sat, 18 Oct 2008)
New Revision: 116

Modified:
   trunk/buildme/TODO
   trunk/buildme/debian/changelog
   trunk/buildme/tools/buildme
   trunk/buildme/tools/buildme.conf
   trunk/buildme/tools/buildme.conf.debug
Log:
* implemented source version check

Modified: trunk/buildme/TODO
===================================================================
--- trunk/buildme/TODO	2008-10-18 14:24:27 UTC (rev 115)
+++ trunk/buildme/TODO	2008-10-18 16:09:35 UTC (rev 116)
@@ -1,11 +1,8 @@
 First priority:
 ---------------
-1. Fix 2 bugs: (medium)
-   https://garage.maemo.org/tracker/index.php?func=detail&aid=2661&group_id=602&atid=2262
-   https://bugs.maemo.org/show_bug.cgi?id=3488
-2. Report problems with packages that have dependencies only available in SDK repo (medium)
-3. Report problems with packages which are breaking SSU (medium)
-4. Implement categories check (easy)
+1. Report problems with packages that have dependencies only available in SDK repo (medium)
+2. Report problems with packages which are breaking SSU (medium)
+3. Implement categories check (easy)
 
 Second priority:
 ---------------

Modified: trunk/buildme/debian/changelog
===================================================================
--- trunk/buildme/debian/changelog	2008-10-18 14:24:27 UTC (rev 115)
+++ trunk/buildme/debian/changelog	2008-10-18 16:09:35 UTC (rev 116)
@@ -1,3 +1,9 @@
+buildme (1.4.5) unstable; urgency=low
+
+  * implemented source version check
+
+ -- Ed Bartosh <bartosh at gmail.com>  Sat, 18 Oct 2008 18:56:34 +0300
+
 buildme (1.4.4) unstable; urgency=low
 
   * Fix: wrong subject (from another package) in report emails 

Modified: trunk/buildme/tools/buildme
===================================================================
--- trunk/buildme/tools/buildme	2008-10-18 14:24:27 UTC (rev 115)
+++ trunk/buildme/tools/buildme	2008-10-18 16:09:35 UTC (rev 116)
@@ -39,6 +39,8 @@
 from datetime import datetime
 
 from minideblib.ChangeFile import ChangeFileException
+from minideblib.AptRepoClient import AptRepoClient
+from minideblib.DpkgVersion import DpkgVersion
 
 from buildlib.fsm import FSM
 from buildlib.exceptions import Error
@@ -338,6 +340,7 @@
     env.params['extraopts'] = ""
     env.params['targets'] = env.params['sbdtargets'].gettargets(dsc)
     env.params['firstbuild'] = True
+    env.params['uploader_handler'] = handler
 
     infras = infrasfactory(result_dir, dsc.name)
 
@@ -351,6 +354,31 @@
 
     return FSM.OK
 
+def check_sources(env):
+    """ Some checks for sources """
+
+    # version check
+    product = env.params['product']
+    logger = env.params['logger']
+    dsc = env.params['dsc']
+    source = dsc['source']
+    version = dsc['version']
+
+    repo = env.params["conf"].get(product, 'src_repo')
+    print "!!!repo: !%s!" % repo
+    client = AptRepoClient(env.params["conf"].get(product, 'src_repo'))
+    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))
+        logger.removeHandler(env.params['uploader_handler'])
+        return FSM.NEXT
+
+    return FSM.OK
+
 def iter_targets(env):
     """ Iterate through targets """
 
@@ -549,7 +577,8 @@
                 iter_destnames: {FSM.OK : init_dest,      FSM.STOP : iter_products},
                 init_dest     : {FSM.OK : iter_fnames,    FSM.NEXT : iter_destnames},
                 iter_fnames   : {FSM.OK : setup_build,    FSM.STOP : None},
-                setup_build   : {FSM.OK : iter_targets,   FSM.NEXT : iter_fnames},
+                setup_build   : {FSM.OK : check_sources,  FSM.NEXT : iter_fnames},
+                check_sources : {FSM.OK : iter_targets,   FSM.NEXT : iter_fnames},
                 iter_targets  : {FSM.OK : do_build,       FSM.STOP : remove_sources},
                 do_build      : {FSM.OK : copy_results},
                 copy_results  : {FSM.OK : check_build},

Modified: trunk/buildme/tools/buildme.conf
===================================================================
--- trunk/buildme/tools/buildme.conf	2008-10-18 14:24:27 UTC (rev 115)
+++ trunk/buildme/tools/buildme.conf	2008-10-18 16:09:35 UTC (rev 116)
@@ -11,6 +11,7 @@
 build_results = ("/scratchbox/users/%(user)s/home/%(user)s/%(target)s/result",)
 upload_timeout = 14400
 result_url = https://garage.maemo.org/builder/%(product)s/%(build_dir)s/
+src_repo = deb-src file:///var/www/extras-devel/ %(product)s free non-free
 
 [chinook]
 product = chinook

Modified: trunk/buildme/tools/buildme.conf.debug
===================================================================
--- trunk/buildme/tools/buildme.conf.debug	2008-10-18 14:24:27 UTC (rev 115)
+++ trunk/buildme/tools/buildme.conf.debug	2008-10-18 16:09:35 UTC (rev 116)
@@ -11,6 +11,7 @@
 build_results = ("/scratchbox/users/%(user)s/home/%(user)s/%(target)s/result",)
 upload_timeout = 14400
 result_url = https://garage.maemo.org/builder/%(product)s/%(build_dir)s/
+src_repo = deb-src file:///var/www/extras-devel/ %(product)s free non-free
 
 [chinook]
 product = chinook