Merged Mitsuya Shibata's FeatureFreezeException explanation flag for requestsync.

debian/changelog

@@ -1,6 +1,8 @@
 ubuntu-dev-tools (0.69) UNRELEASED; urgency=low
 
-  * Changes go here.
+  [ Mitsuya Shibata ]
+  * requestsync: Added -e option for FeatureFreezeException explanations and
+    updated manpage.
 
  -- Jonathan Davies <jpds@ubuntu.com>  Sun, 15 Mar 2009 15:34:47 +0000
 

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
+Use this flag after FeatureFreeze for non-bug fix syncs. \fBrequestsync\fR will
+subscribe ubuntu-release team (for main/restricted packages) or motu-release
+team (for universe/multiverse packages) instead of sponsorship team.
+.TP
 .B <source package>
 This is the source package that you would like to be synced from Debian.
 .TP

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] <source "
+    usage = "Usage: %prog [-d distro] [-k keyid] [-n] [--lp] [-s] [-e] "
-    usage += "package> <target release> [base version]"
+    usage += "<source package> <target release> [base version]"
     optParser = OptionParser(usage)
 
     optParser.add_option("-d", type = "string",
@@ -484,6 +484,10 @@ if __name__ == '__main__':
         dest = "sponsor", default = False,
         help = "Force sponsorship requirement (shall be autodetected if not " \
             "specified).")
+    optParser.add_option("-e", action = "store_true",
+        dest = "ffe", default = False,
+        help = "Use this after FeatureFreeze for non-bug fix syncs, changes
+            "default subscription to the appropriate release team.")
 
     (options, args) = optParser.parse_args()
 
@@ -493,6 +497,7 @@ if __name__ == '__main__':
     use_lp_bugs = options.lpbugs
     need_interaction = False
     distro = options.dist
+    ffe = options.ffe
 
     if len(args) not in (2, 3):
         optParser.error("Source package / target release missing - please " \
@@ -537,9 +542,18 @@ if __name__ == '__main__':
             subscribe = 'ubuntu-main-sponsors'
         else:
             subscribe = 'ubuntu-universe-sponsors'
+    if ffe == True:
+        status = 'new'
+        if component in ['main', 'restricted']:
+            subscribe = 'ubuntu-release'
+        else:
+            subscribe = 'motu-release'
+
 
     pkg_to_sync = '%s %s (%s) from Debian %s (%s).' % (srcpkg, deb_version, component, distro, debiancomponent)
     title = "Sync %s" % pkg_to_sync
+    if ffe == True:
+        title = "FFe: " + title
     report = "Please sync %s\n\n" % pkg_to_sync
     
     base_ver = cur_ver
@@ -556,6 +570,18 @@ if __name__ == '__main__':
         report += 'Explanation of the Ubuntu delta and why it can be dropped:\n' + \
                   '>>> 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