From c359d6ea5a1ae589eb6ef3380aecf71bf099413b Mon Sep 17 00:00:00 2001 From: Mitsuya Shibata Date: Mon, 16 Mar 2009 00:27:27 +0900 Subject: [PATCH] Add FFe report for requestsync. --- doc/requestsync.1 | 9 +++++++-- requestsync | 30 ++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/doc/requestsync.1 b/doc/requestsync.1 index ef8db6b..118b70f 100644 --- a/doc/requestsync.1 +++ b/doc/requestsync.1 @@ -2,9 +2,9 @@ .SH NAME requestsync \- helper to file sync requests for Ubuntu .SH SYNOPSIS -.B requestsync\fR [\fB\-d distro\fR] [\fB\-ns\fR] [\fB\-k \fIkeyid\fR] <\fBsource package\fR> <\fBtarget release\fR> [\fIbase version\fR] +.B requestsync\fR [\fB\-d distro\fR] [\fB\-nse\fR] [\fB\-k \fIkeyid\fR] <\fBsource package\fR> <\fBtarget release\fR> [\fIbase version\fR] .br -.B requestsync \-\-lp\fR [\fB\-ns\fR] <\fBsource package\fR> <\fBtarget release\fR> [\fIbase version\fR] +.B requestsync \-\-lp\fR [\fB\-nse\fR] <\fBsource package\fR> <\fBtarget release\fR> [\fIbase version\fR] .br .B requestsync \-h .SH DESCRIPTION @@ -62,6 +62,11 @@ You need this option if you are not a member of ubuntu-dev for universe or multiverse, or ubuntu-core-dev for main or restricted. This shall disable the Launchpad team membership checking described above. .TP +.B \-e +Specifies whethere after FeatureFreeze. If after FeatureFreeze, then +requestsync will subscribe ubuntu-release team (for main/restricted syncs) +or motu-release team (for universe/multiverse syncs) instead of suponsor team. +.TP .B This is the source package that you would like to be synced from Debian. .TP diff --git a/requestsync b/requestsync index add7787..9b0d597 100755 --- a/requestsync +++ b/requestsync @@ -463,8 +463,8 @@ def edit_report(subject, body, changes_required=False): if __name__ == '__main__': # Our usage options. - usage = "Usage: %prog [-d distro] [-k keyid] [-n] [--lp] [-s] >> ENTER_EXPLANATION_HERE <<<\n\n' + if ffe == True: + need_interaction = True + + print 'To approve FeatureFreeze exception, you need to state ' + print 'the reason why you feel it is necessary.' + print 'Press ENTER to start your editor. Press Control-C to abort now.' + print 'Not saving the report file will abort the request, too.' + raw_input_exit_on_ctrlc() + report += 'Explanation of FeatureFreeze exception:\n' + \ + '>>> ENTER_EXPLANATION_HERE <<<\n\n' + + if sponsorship == 'perpackageupload': report += 'Note that I have per-package upload permissions for %s.\n\n' % srcpkg