Merge lp:~dholbach/ubuntu-dev-tools/permissions-reorg into lp:~ubuntu-dev/ubuntu-dev-tools/trunk

Proposed by Daniel Holbach on 2010-03-15
Status: Merged
Merge reported by: Daniel Holbach
Merged at revision: not available
Proposed branch: lp:~dholbach/ubuntu-dev-tools/permissions-reorg
Merge into: lp:~ubuntu-dev/ubuntu-dev-tools/trunk
Diff against target: 294 lines (+15/-209)
6 files modified
debian/changelog (+8/-1)
debian/copyright (+1/-1)
doc/requestsync.1 (+4/-7)
hugdaylist (+1/-2)
requestsync (+1/-4)
ubuntutools/ppaput.py (+0/-194)
To merge this branch: bzr merge lp:~dholbach/ubuntu-dev-tools/permissions-reorg
Reviewer Review Type Date Requested Status
Ubuntu Development Team 2010-03-15 Pending
Review via email: mp+21355@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-03-08 23:34:59 +0000
3+++ debian/changelog 2010-03-15 09:25:31 +0000
4@@ -6,7 +6,14 @@
5 [ Emmet Hikory ]
6 * mk-sbuild: Really don't use build-arm-chroot
7
8- -- Emmet Hikory <persia@ubuntu.com> Tue, 09 Mar 2010 08:32:50 +0900
9+ [ Daniel Holbach ]
10+ * hugdaylist, requestsync, doc/requestsync.1:
11+ ubuntu-{main,universe}-sponsors → ubuntu-sponsors,
12+ {ubuntu,motu}-release → ubuntu-release.
13+ * ubuntutools/ppaput.py: removed, not necessary any more.
14+ * debian/copyright: removed references to ppaput.
15+
16+ -- Daniel Holbach <daniel.holbach@ubuntu.com> Mon, 15 Mar 2010 10:21:31 +0100
17
18 ubuntu-dev-tools (0.95) lucid; urgency=low
19
20
21=== modified file 'debian/copyright'
22--- debian/copyright 2010-03-08 09:59:50 +0000
23+++ debian/copyright 2010-03-15 09:25:31 +0000
24@@ -71,7 +71,7 @@
25
26 dch-repeat, get-branches, get-build-deps, grab-attachments, grab-merge,
27 hugdaylist, manage-credentials, massfile, mk-sbuild, pbuilder-dist-simple,
28-ppaput, pull-debian-debdiff, pull-debian-source, pull-lp-source, pull-revu-source,
29+pull-debian-debdiff, pull-debian-source, pull-lp-source, pull-revu-source,
30 setup-packaging-environment, suspicious-source, ubuntu-build and what-patch are
31 licensed under the GNU General Public License, version 3:
32
33
34=== modified file 'doc/requestsync.1'
35--- doc/requestsync.1 2009-11-02 18:20:56 +0000
36+++ doc/requestsync.1 2010-03-15 09:25:31 +0000
37@@ -23,9 +23,8 @@
38 .PP
39 \fBrequestsync\fR checks if you have the permissions to request the sync from
40 the archive administrators directly by checking if you are a member of the
41-\fI~ubuntu\-dev\fR team (for universe/multiverse syncs) or a member of the
42-\fI~ubuntu\-core\-dev\fR team (for main/restricted syncs) on Launchpad.
43-If you are not a member of the appropriate team, the script will subscribe
44+\fI~ubuntu\-dev\fR team on Launchpad.
45+If you are not a member of the team, the script will subscribe
46 the necessary team with approval rights to the bug report for you.
47
48 .PP
49@@ -58,14 +57,12 @@
50 .TP
51 .B \-s
52 Specifies that you require sponsorship.
53-You need this option if you are not a member of ubuntu-dev for universe or
54-multiverse, or ubuntu-core-dev for main or restricted. This shall disable the
55+You need this option if you are not a member of ubuntu-dev. This shall disable the
56 Launchpad team membership checking described above.
57 .TP
58 .B \-e
59 Use this flag after FeatureFreeze for non-bug fix syncs. \fBrequestsync\fR will
60-subscribe ubuntu-release team (for main/restricted packages) or motu-release
61-team (for universe/multiverse packages) instead of sponsorship team.
62+subscribe ubuntu-release team instead of sponsorship team.
63 .TP
64 .B <source package>
65 This is the source package that you would like to be synced from Debian.
66
67=== modified file 'hugdaylist'
68--- hugdaylist 2009-11-07 19:34:59 +0000
69+++ hugdaylist 2010-03-15 09:25:31 +0000
70@@ -75,8 +75,7 @@
71 subscriptions = set(s.person.name for s in task.bug.subscriptions) #this is expensive, parse name out of self_link instead?
72 if (task.status != "Fix Committed" and
73 (not task.assignee or task.assignee.name in ['motu','desktop-bugs']) and
74- 'ubuntu-main-sponsors' not in subscriptions and
75- 'ubuntu-universe-sponsors' not in subscriptions and
76+ 'ubuntu-sponsors' not in subscriptions and
77 'ubuntu-archive' not in subscriptions):
78 return True
79 return False
80
81=== modified file 'requestsync'
82--- requestsync 2010-03-05 16:59:46 +0000
83+++ requestsync 2010-03-15 09:25:31 +0000
84@@ -213,10 +213,7 @@
85 subscribe = 'ubuntu-archive'
86 if sponsorship:
87 status = 'new'
88- if ubuntu_component in ('main', 'restricted'):
89- subscribe = 'ubuntu-main-sponsors'
90- else:
91- subscribe = 'ubuntu-universe-sponsors'
92+ subscribe = 'ubuntu-sponsors'
93 if ffe:
94 status = 'new'
95 subscribe = 'ubuntu-release'
96
97=== removed file 'ubuntutools/ppaput.py'
98--- ubuntutools/ppaput.py 2008-02-17 22:39:10 +0000
99+++ ubuntutools/ppaput.py 1970-01-01 00:00:00 +0000
100@@ -1,194 +0,0 @@
101-# -*- coding: utf-8 -*-
102-#
103-# Copyright 2007, Canonical, Daniel Holbach
104-# Modified by Andrew Hunter
105-# License: GPLv3
106-
107-import re
108-import os
109-import sys
110-import string
111-
112-try:
113- import launchpadbugs.connector as Connector
114-except:
115- raise ImportError, "You need python-launchpad-bugs (>= 0.2.14) installed to use ppaput."
116- sys.exit(1)
117-
118-#try:
119-# import apt
120-#except:
121-# raise ImportError, "You need python-apt installed to use ppaput."
122-# sys.exit(1)
123-
124-def dput_check():
125- if not os.path.exists("/usr/bin/dput"):
126- print >> sys.stderr, "You need to install the dput package."
127- sys.exit(1)
128-
129-
130-def find_fixed_launchpad_bug(changesfile):
131- changes = open(changesfile).readlines()
132- for line in changes:
133- if line.startswith("Launchpad-Bugs-Fixed"):
134- return line.split(":")[1].split()
135- return []
136-
137-
138-def call_dput(location, changes):
139- dput_check()
140-
141- incoming = ""
142- res = False
143-
144- (dummy, output, dummy) = os.popen3("dput --debug %s %s" % (location, changes))
145- text = output.readlines()
146- for line in text:
147- if line.startswith("D: Incoming: "):
148- incoming = line.split("D: Incoming: ")[1].strip()
149- if incoming[-1] == "/":
150- incoming = incoming[:-1]
151- if line.startswith("Successfully uploaded packages."):
152- res = True
153- return (res, incoming)
154-
155-
156-def lookup_dput_host(host):
157- dput_check()
158- (dummy, output, dummy) = os.popen3("dput -H | grep ^%s" % host)
159- text = output.read()
160- if text:
161- return text.split()[2]
162- return ""
163-
164-
165-def call_debuild(options):
166-# FIXME: this requires magic, that figures out when to use --native --working,
167-# etc.
168-# if os.path.exists(".bzr") and os.path.exists("/usr/bin/bzr-buildpackage"):
169-# return os.system("bzr bd -S --builder='-k%s %s'" % \
170-# (os.getenv("DEBEMAIL"), \
171-# string.join(options, " "))) == 0
172-# else:
173- return os.system("debuild -S -k%s %s" % \
174- (os.getenv("DEBEMAIL"), \
175- string.join(options, " "))) == 0
176-
177-def get_name_version_section_and_release():
178- changelogfile = "debian/changelog"
179- if not os.path.exists(changelogfile):
180- print >> sys.stderr, "%s not found." % changelogfile
181- sys.exit(1)
182- controlfile = "debian/control"
183- if not os.path.exists(controlfile):
184- print >> sys.stderr, "%s not found." % controlfile
185- sys.exit(1)
186-
187- head = open(changelogfile).readline()
188- (name, \
189- version, \
190- release) = re.findall(r'^(.*)\ \((.*)\)\ (.*?)\;\ .*', head)[0]
191- section = "main"
192-
193-#
194-#Is this nessicary? All ppa install to main now.
195-#
196-
197-# for line in open(controlfile).readlines():
198-# if line.startswith("Section"):
199-# if line.split("Section: ")[1].count("/")>0:
200-# section = line.split("Section: ")[1].split("/")[0].strip()
201-# return (name, version, section)
202-
203- return (name, version, section, release)
204-
205-def assemble_bug_comment_text(host, incoming, section, sourcepackage, version,
206- release):
207- if host == "ppa.launchpad.net":
208- dsc_file_location = "http://%s/%s/pool/%s/%s/%s/%s_%s.dsc" % \
209- (host, incoming[1:], section, sourcepackage[0], sourcepackage, \
210- sourcepackage, version)
211- else:
212-# FIXME: this needs to be much much cleverer at some stage
213- dsc_file_location = "http://%s/%s/pool/%s/%s/%s/%s_%s.dsc" % \
214- (host, incoming, section, sourcepackage[0], sourcepackage, version)
215- return """A new version of %s was uploaded to fix this bug.
216-
217-To review the source the current version, please run
218-
219- dget -x %s
220-
221-
222-The package will get built by Launchpad in a while. If you want to test it,
223-please run the following commands:
224-
225- sudo -s
226- echo >> /etc/apt/sources.list
227- echo "deb http://%s/%s %s main universe multiverse restricted" >> /etc/apt/sources.list
228- apt-get update
229- apt-get install <package>
230-""" % (sourcepackage, dsc_file_location, host, incoming[1:], release)
231-
232-
233-def deal_with_bugreport(bugnumbers, host, section, incoming, sourcepackage,
234- version, release):
235- if not os.path.exists(os.path.expanduser("~/.lpcookie")):
236- print >> sys.stderr, \
237- "You need your Launchpad Cookie to be stored in ~/.lpcookie"
238- sys.exit(1)
239-
240- #print apt.Cache()[sourcepackage].section.split("/")[0].count("verse")
241- (dummy, output, dummy) = os.popen3(
242-"apt-cache showsrc %s | grep Directory | cut -d' ' -f2 | cut -d'/' -f2" % \
243- sourcepackage)
244- component = output.read().strip()
245-
246- Bug = Connector.ConnectBug()
247- Bug.authentication = os.path.expanduser("~/.lpcookie")
248-
249- for bugnumber in bugnumbers:
250- bug = Bug(int(bugnumber))
251- if component in ["main", "restricted"] and \
252- 'ubuntu-main-sponsors' not in [str(s) for s in bug.subscribers]:
253- bug.subscribers.add('ubuntu-main-sponsors')
254- if component in ["universe", "multiverse"] and \
255- 'ubuntu-universe-sponsors' not in [str(s) for s in bug.subscribers]:
256- bug.subscribers.add('ubuntu-universe-sponsors')
257- if not component:
258- bug.tags.append("needs-packaging")
259-
260- comment = Bug.NewComment(text=assemble_bug_comment_text(host, incoming,
261- section,
262- sourcepackage,
263- version,
264- release),
265- subject="Fix in %s (%s)" % \
266- (sourcepackage, version))
267- bug.comments.add(comment)
268-
269- if bug.status != "Fix Committed":
270- bug.status = "Fix Committed"
271- bug.commit()
272-
273-
274-def file_bug(sourcepackage, version):
275- Bug = Connector.ConnectBug()
276- Bug.authentication = os.path.expanduser("~/.lpcookie")
277-
278- try:
279- bug = Bug.New(product={"name": sourcepackage, "target": "ubuntu"},
280- summary="Please sponsor %s %s" % \
281- (sourcepackage, version),
282- description=\
283- "The new package will be uploaded to PPA shortly.")
284- except:
285- bug = Bug.New(product={"name": "ubuntu"},
286- summary="Please sponsor %s %s" % \
287- (sourcepackage, version),
288- description=\
289- "The new package will be uploaded to PPA shortly.")
290-
291- print "Successfully filed bug %s: http://launchpad.net/bugs/%s" % \
292- (bug.bugnumber, bug.bugnumber)
293-
294- return bug.bugnumber

Subscribers

People subscribed via source and target branches

to status/vote changes: