* requestsync: Readd sponsorship flag and related documentation in

doc/requestsync.1 (LP: #270605).
This commit is contained in:
Jonathan Davies 2008-12-29 18:58:11 +00:00
parent dd02a931ba
commit 50d55f1d9a
3 changed files with 14 additions and 5 deletions

2
debian/changelog vendored
View File

@ -17,6 +17,8 @@ ubuntu-dev-tools (0.50) UNRELEASED; urgency=low
[ Jonathan Davies ] [ Jonathan Davies ]
* buildd: Show which architectures are available in help and created a * buildd: Show which architectures are available in help and created a
list of them for easy addition of new ones. list of them for easy addition of new ones.
* requestsync: Readd sponsorship flag and related documentation in
doc/requestsync.1 (LP: #270605).
-- Jonathan Davies <jpds@ubuntu.com> Mon, 29 Dec 2008 18:45:02 +0000 -- Jonathan Davies <jpds@ubuntu.com> Mon, 29 Dec 2008 18:45:02 +0000

View File

@ -58,6 +58,12 @@ This is only used if the sync request is mailed to Launchpad.
Use the launchpadbugs python module (packaged as python\-launchpad\-bugs) to Use the launchpadbugs python module (packaged as python\-launchpad\-bugs) to
file the sync request in Launchpad. file the sync request in Launchpad.
.TP .TP
.B \-s
Specifies that you require sponsorship.
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 <source package> .B <source package>
This is the source package that you would like to be synced from Debian. This is the source package that you would like to be synced from Debian.
.TP .TP

View File

@ -8,7 +8,7 @@
# Michael Bienia <geser@ubuntu.com> (python-launchpad-bugs support) # Michael Bienia <geser@ubuntu.com> (python-launchpad-bugs support)
# Daniel Hahler <ubuntu@thequod.de> # Daniel Hahler <ubuntu@thequod.de>
# Iain Lane <iain@orangesquash.org.uk> # Iain Lane <iain@orangesquash.org.uk>
# Jonathan Patrick Davies <jpds@ubuntu.com> # Jonathan Davies <jpds@ubuntu.com>
# #
# ################################################################## # ##################################################################
# #
@ -453,7 +453,7 @@ if __name__ == '__main__':
distro = 'unstable' distro = 'unstable'
try: try:
opts, args = getopt.gnu_getopt(sys.argv[1:], 'hnd:k:', ('lp')) opts, args = getopt.gnu_getopt(sys.argv[1:], 'hsnd:k:', ('lp'))
except getopt.GetoptError: except getopt.GetoptError:
usage() usage()
for o, a in opts: for o, a in opts:
@ -461,6 +461,7 @@ if __name__ == '__main__':
if o == '-n': newsource = True if o == '-n': newsource = True
if o == '-k': keyid = a if o == '-k': keyid = a
if o == '-d': distro = a if o == '-d': distro = a
if o == "-s": sponsorship = True
if o == '--lp': use_lp_bugs = True if o == '--lp': use_lp_bugs = True
if len(args) not in (2, 3): if len(args) not in (2, 3):
@ -468,7 +469,6 @@ if __name__ == '__main__':
if not use_lp_bugs and not get_email_address(): if not use_lp_bugs and not get_email_address():
sys.exit(1) sys.exit(1)
(srcpkg, release) = args[:2] (srcpkg, release) = args[:2]
force_base_ver = None force_base_ver = None
@ -480,8 +480,9 @@ if __name__ == '__main__':
debiancomponent = debian_component(srcpkg, distro) debiancomponent = debian_component(srcpkg, distro)
deb_version = cur_deb_version(srcpkg, distro) deb_version = cur_deb_version(srcpkg, distro)
sponsorship = checkNeedsSponsorship(component) # -s flag not specified - check if we do need sponsorship.
if sponsorship == False: sponsorship = checkNeedsSponsorship(component)
if deb_version == cur_ver: if deb_version == cur_ver:
print 'The versions in Debian and Ubuntu are the same already (%s). Aborting.' % (deb_version,) print 'The versions in Debian and Ubuntu are the same already (%s). Aborting.' % (deb_version,)