Merge lp:~andrewsomething/ubuntu-dev-tools/665202 into lp:~ubuntu-dev/ubuntu-dev-tools/trunk

Proposed by Andrew Starr-Bochicchio
Status: Rejected
Rejected by: Benjamin Drung
Proposed branch: lp:~andrewsomething/ubuntu-dev-tools/665202
Merge into: lp:~ubuntu-dev/ubuntu-dev-tools/trunk
Diff against target: 49 lines (+13/-1)
2 files modified
debian/changelog (+4/-0)
syncpackage (+9/-1)
To merge this branch: bzr merge lp:~andrewsomething/ubuntu-dev-tools/665202
Reviewer Review Type Date Requested Status
Benjamin Drung Disapprove
Review via email: mp+39689@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Benjamin Drung (bdrung) wrote :

I am currently working on the same bug. I will use your error message (that's better than mine).

Revision history for this message
Benjamin Drung (bdrung) wrote :

We worked on the same bug at the same time. I took your error message. My fix is committed in r781.

review: Disapprove

Unmerged revisions

780. By Andrew Starr-Bochicchio

syncpackage: Don't crash if DEBFULLNAME environment variable isn't set (LP: #665202).

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-10-29 13:54:02 +0000
3+++ debian/changelog 2010-10-30 16:27:47 +0000
4@@ -29,6 +29,10 @@
5 * pbuilder-dist: Explicitly use debian keyring when working with a
6 Debian chroot, working around #599695
7
8+ [ Andrew Starr-Bochicchio ]
9+ * syncpackage: Don't crash if DEBFULLNAME environment variable
10+ isn't set (LP: #665202).
11+
12 -- Stefano Rivera <stefanor@ubuntu.com> Wed, 27 Oct 2010 23:20:06 +0200
13
14 ubuntu-dev-tools (0.104) experimental; urgency=low
15
16=== modified file 'syncpackage'
17--- syncpackage 2010-10-27 21:20:26 +0000
18+++ syncpackage 2010-10-30 16:27:47 +0000
19@@ -394,6 +394,7 @@
20 usage = "%s [options] <.dsc URL/path or package name>" % (script_name)
21 epilog = "See %s(1) for more info." % (script_name)
22 parser = optparse.OptionParser(usage=usage, epilog=epilog)
23+ uploader_name = None
24
25 parser.add_option("-d", "--distribution", type = "string",
26 dest = "dist", default = None,
27@@ -409,7 +410,7 @@
28 parser.add_option("-n", "--uploader-name", dest="uploader_name",
29 help="Use UPLOADER_NAME as the name of the maintainer "
30 "for this upload instead of evaluating DEBFULLNAME.",
31- default = os.environ["DEBFULLNAME"])
32+ default = uploader_name)
33 parser.add_option("-e", "--uploader-email", dest="uploader_email",
34 help="Use UPLOADER_EMAIL as email address of the maintainer "
35 "for this upload instead of evaluating DEBEMAIL.",
36@@ -433,6 +434,13 @@
37 (script_name, ", ".join(args))
38 sys.exit(1)
39
40+ if options.uploader_name is None:
41+ try:
42+ options.uploader_name = os.environ["DEBFULLNAME"]
43+ except KeyError:
44+ print >> sys.stderr, "%s: Error: No UPLOADER_NAME. You must pass the --uploader-name option or set the DEBFULLNAME environment variable." % (script_name)
45+ sys.exit(1)
46+
47 invalid_bug_numbers = filter(lambda x: not x.isdigit(), options.bugs)
48 if len(invalid_bug_numbers) > 0:
49 print >> sys.stderr, "%s: Error: Invalid bug number(s) specified: %s" % \