← Back to branch summary

~bzr/ubuntu/lucid/hitchhiker/packaging

« back to all changes in this revision

Viewing changes to hitchhiker

  • Committer: Aaron Bentley
  • Date: 2008-11-12 01:08:35 UTC
  • Revision ID: aaron@aaronbentley.com-20081112010835-ek0ejv3w5r5yt9rt
Handle bad URLs better

Show diffs side-by-side

added added

removed removed

Lines of Context:
hitchhiker
169
169
 
170
170
        The location may be any URL supported by Bazaar.
171
171
        """
172
 
        self.transport = get_transport(location,
173
 
            possible_transports=self.possible_transports)
 
172
        try:
 
173
            self.transport = get_transport(location,
 
174
                possible_transports=self.possible_transports)
 
175
        except (bzr_errors.InvalidURL, bzr_errors.InvalidLocationAlias), e:
 
176
            raise UserError(e)
174
177
        note('Opened %s' % self.transport.base)
175
178
 
176
179
    @command()
386
389
        location = sys.argv[1]
387
390
    else:
388
391
        location = None
389
 
    prompt = PromptCmd(location, first_command)
390
 
    if first_command is None:
391
 
        try:
392
 
            prompt.cmdloop()
393
 
        except KeyboardInterrupt:
394
 
            sys.stderr.write("\nInterrupted.\n")
395
 
            sys.exit(2)
 
392
    try:
 
393
        prompt = PromptCmd(location, first_command)
 
394
    except UserError, e:
 
395
        print e.args[0]
 
396
    else:
 
397
        if first_command is None:
 
398
            try:
 
399
                prompt.cmdloop()
 
400
            except KeyboardInterrupt:
 
401
                sys.stderr.write("\nInterrupted.\n")
 
402
                sys.exit(2)
396
403
 
397
404
 
398
405
if __name__ == "__main__":