Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-13 08:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

* pbuilder-dist:

Browse Source 
- 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).
This commit is contained in:
Siegfried-Angel Gevatter Pujals 2010-09-25 10:47:48 +02:00
parent b6648db1ea
commit 2c2ba94a96
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -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 ubuntu-dev-tools (0.103) experimental; urgency=low
[ Benjamin Drung ] [ Benjamin Drung ]

8
pbuilder-dist
View File

@ -152,7 +152,7 @@ class pbuilder_dist:
if operation.endswith('.dsc'): if operation.endswith('.dsc'):
if os.path.isfile(operation): if os.path.isfile(operation):
self.operation = 'build' self.operation = 'build'
return operation return [operation]
else: else:
print 'Error: Could not find file «%s».' % operation print 'Error: Could not find file «%s».' % operation
sys.exit(1) sys.exit(1)
@ -162,7 +162,7 @@ class pbuilder_dist:
sys.exit(1) sys.exit(1)
else: else:
self.operation = operation self.operation = operation
return '' return []
def get_command(self, remaining_arguments = None): def get_command(self, remaining_arguments = None):
""" pbuilder_dist.get_command -> string """ pbuilder_dist.get_command -> string
@ -356,7 +356,7 @@ def main():
help(1) help(1)
# Parse the operation # 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): if app.operation == 'build' and not '.dsc' in ' '.join(args):
print 'Error: You have to specify a .dsc file if you want to build.' 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: if not '--debug-echo' in args:
sys.exit(os.system(app.get_command(args))) sys.exit(os.system(app.get_command(args)))
else: else:
print app.get_command((arg for arg in args if arg)).replace( print app.get_command((args)).replace(
' --debug-echo', '') ' --debug-echo', '')
if __name__ == '__main__': if __name__ == '__main__':