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

[Andrew Starr-Bochicchio]

[Benjamin Drung (bdrung)]

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

[Benjamin Drung (bdrung)]

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 on 2010-10-30

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

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