Index: CHANGES.txt =================================================================== --- CHANGES.txt (révision 86647) +++ CHANGES.txt (copie de travail) @@ -1,6 +1,7 @@ 0.3.5 SVN/Unreleased ==================== + - add support for cron multiple values ('1 2,3,4 * * * ') 0.3.4 (2009-05-21) ==================== Index: collective/buildbot/project.py =================================================================== --- collective/buildbot/project.py (révision 86647) +++ collective/buildbot/project.py (copie de travail) @@ -187,11 +187,20 @@ cron = self.options.get('cron_scheduler', None) if cron is not None: try: - minute, hour, dom, month, dow = [v=='*' and v or int(v) - for v in cron.split()[:5]] + minute, hour, dom, month, dow = cron.split()[:5] + timeline = {'minute': minute, + 'hour': hour, + 'dom': dom, + 'month': month, + 'dow': dow} + for var in timeline: + if not '*' in timeline[var]: + timeline[var] = [int(v) for v in timeline[var].split(',')] name = 'Cron scheduler for %s at %s' % (self.name, cron) self.schedulers.append(Nightly( - name, self.builders(), minute, hour, dom, month, dow)) + name, self.builders(), + minute=timeline['minute'], hour=timeline['hour'], + dayOfMonth=timeline['month'], month=timeline['month'], dayOfWeek=timeline['dow'],)) except (IndexError, ValueError, TypeError): log.msg('Invalid cron definition for the cron ' Index: CONTRIBUTORS.txt =================================================================== --- CONTRIBUTORS.txt (révision 86647) +++ CONTRIBUTORS.txt (copie de travail) @@ -13,3 +13,4 @@ - Jean-Francois Roche - Mustapha Benali [mustapha] - Sylvain Viollon [thefunny] + - Mathieu Pasquet [kiorky]