From 2c2ba94a96c5dc43842a795ea6cef86774d4156a Mon Sep 17 00:00:00 2001
From: Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>
Date: Sat, 25 Sep 2010 10:47:48 +0200
Subject: [PATCH] * pbuilder-dist:    - Fix regression where pbuilder would get
 an empty string as first      positional argument.    - Update --debug-echo
 so that it doesn't hide empty parameters (now      that they are wrapped
 around quotes they are significant).

---
 debian/changelog | 10 ++++++++++
 pbuilder-dist    |  8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8013d2a..8cce8c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ubuntu-dev-tools (0.104) experimental; urgency=low
+
+  * pbuilder-dist:
+     - Fix regression where pbuilder would get an empty string as first
+       positional argument.
+     - Update --debug-echo so that it doesn't hide empty parameters (now
+       that they are wrapped around quotes they are significant).
+
+ -- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>  Sat, 25 Sep 2010 10:44:46 +0200
+
 ubuntu-dev-tools (0.103) experimental; urgency=low
 
   [ Benjamin Drung ]
diff --git a/pbuilder-dist b/pbuilder-dist
index 703f76c..c6fa414 100755
--- a/pbuilder-dist
+++ b/pbuilder-dist
@@ -152,7 +152,7 @@ class pbuilder_dist:
 			if operation.endswith('.dsc'):
 				if os.path.isfile(operation):
 					self.operation = 'build'
-					return operation
+					return [operation]
 				else:
 					print 'Error: Could not find file «%s».' % operation
 					sys.exit(1)
@@ -162,7 +162,7 @@ class pbuilder_dist:
 				sys.exit(1)
 		else:
 			self.operation = operation
-			return ''
+			return []
 	
 	def get_command(self, remaining_arguments = None):
 		""" pbuilder_dist.get_command -> string
@@ -356,7 +356,7 @@ def main():
 		help(1)
 	
 	# Parse the operation
-	args = [app.set_operation(args.pop(0))] + args
+	args = app.set_operation(args.pop(0)) + args
 	
 	if app.operation == 'build' and not '.dsc' in ' '.join(args):
 		print 'Error: You have to specify a .dsc file if you want to build.'
@@ -366,7 +366,7 @@ def main():
 	if not '--debug-echo' in args:
 		sys.exit(os.system(app.get_command(args)))
 	else:
-		print app.get_command((arg for arg in args if arg)).replace(
+		print app.get_command((args)).replace(
 			' --debug-echo', '')
 
 if __name__ == '__main__':