diff --git a/distrib/autobuild.py b/distrib/autobuild.py index 187171384d..8c7b75b6cd 100755 --- a/distrib/autobuild.py +++ b/distrib/autobuild.py @@ -21,6 +21,11 @@ from builder.utils import * +def pull_from_branch(): + """Pulls commits from the repository.""" + git_pull() + + def create_build_event(): """Creates and tags a new build for with today's number.""" print 'Creating a new build event.' @@ -375,6 +380,7 @@ def sorted_commands(): commands = { + 'pull': pull_from_branch, 'create': create_build_event, 'platform_release': todays_platform_release, 'changes': update_changes, @@ -396,6 +402,7 @@ def sorted_commands(): print 'The arguments must be: (command) [args]' print 'Commands:', string.join(sorted_commands()) print 'Arguments:' + print '--branch Branch to use (default: master)' print '--distrib Doomsday distrib directory' print '--events Event directory (builds are stored here in subdirs)' print '--apt Apt repository' diff --git a/distrib/pilot.py b/distrib/pilot.py index 2c5719b3c4..bb3f6be17b 100755 --- a/distrib/pilot.py +++ b/distrib/pilot.py @@ -306,10 +306,12 @@ def doTask(task): elif task == 'branch_stable': msg("SWITCH TO STABLE BRANCH") switchToBranch('stable') + return autobuild('pull') elif task == 'branch_master': msg("SWITCH TO MASTER BRANCH") switchToBranch('master') + return autobuild('pull') elif task == 'tag_build': msg("TAG MASTER BRANCH")